Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Sun, 25 Nov 2012 17:49:17 +0000 (12:49 -0500)]
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>

1  2 
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/nfc/pn533.c
net/core/net-sysfs.c
net/ipv4/route.c
net/mac80211/ibss.c
net/nfc/llcp/llcp.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge