David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
brcmfmac	brcmfmac: Fix iovar 'bw_cap' set command failure	2014-05-12 14:15:10 -04:00
brcmsmac	mac80211: add vif to flush call	2014-04-09 10:55:29 +02:00
brcmutil	brcmutil: simplify brcmu_pkt_free_skb()	2013-04-22 15:20:21 -04:00
include	brcmfmac: use mfp if required from user-space	2014-03-27 14:20:06 -04:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-12-06 09:50:45 -05:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00