Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Dec 2011 19:07:12 +0000 (14:07 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Dec 2011 19:07:12 +0000 (14:07 -0500)
commite7ab5f1c323e137120561daeec75e91a1bd9ec8b
tree758be4a11287005187b055ee8f8112a24d7d8ce5
parent1af32f0fcf33ddca52c8fd2b5bc84c129dcb1bdd
parent329456d1ffb416c220813725b7363cda9975c9aa
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/bluetooth/btmrvl_sdio.c
drivers/ssb/driver_pcicore.c
net/mac80211/agg-tx.c