Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 9 Dec 2011 19:07:12 +0000 (14:07 -0500)]
1  2 
drivers/bluetooth/btmrvl_sdio.c
drivers/ssb/driver_pcicore.c
net/mac80211/agg-tx.c

Simple merge
Simple merge
Simple merge