]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Dec 2011 23:49:39 +0000 (10:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Dec 2011 23:49:39 +0000 (10:49 +1100)
1  2 
drivers/bluetooth/btmrvl_sdio.c
drivers/ssb/driver_pcicore.c
net/mac80211/agg-tx.c

Simple merge
Simple merge
Simple merge