Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Jan 2012 02:35:43 +0000 (21:35 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Jan 2012 02:35:43 +0000 (21:35 -0500)
commit117ff42fd43e92d24c6aa6f3e4f0f1e1edada140
treec08e1c0357fde481a16489b77feb8f6073faf538
parent1d5783030a14d1b6ee763f63c8136e581f48b365
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610
Merge git://git./linux/kernel/git/davem/net
MAINTAINERS
drivers/net/ethernet/freescale/Kconfig
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/b43/pio.c
drivers/net/wireless/mwifiex/sta_ioctl.c
net/bluetooth/hci_core.c
net/sched/sch_qfq.c