David S. Miller 188d1f76d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/ethtool.c drivers/net/vmxnet3/vmxnet3_drv.c drivers/net/wireless/iwlwifi/dvm/tx.c net/ipv6/route.c The ipv6 route.c conflict is simple, just ignore the 'net' side change as we fixed the same problem in 'net-next' by eliminating cached neighbours from ipv6 routes. The e1000e conflict is an addition of a new statistic in the ethtool code, trivial. The vmxnet3 conflict is about one change in 'net' removing a guarding conditional, whilst in 'net-next' we had a netdev_info() conversion. The iwlwifi conflict is dealing with a WARN_ON() conversion in 'net-next' vs. a revert happening in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-05 14:12:20 -05:00
..
brcmfmac	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-01-28 14:43:00 -05:00
brcmsmac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
brcmutil	brcm80211: brcmu_pkt_buf_free_skb() should handle NULL	2012-06-05 15:23:20 -04:00
include	brcmsmac: Add brcms_dbg_ht() debug macro	2012-11-20 14:07:25 -05:00
Kconfig	brcm80211: Allow trace support to be enabled separately from debug	2012-11-20 14:05:22 -05:00
Makefile	brcm80211: Use normal DEBUG define	2012-01-24 14:21:13 -05:00