]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit9587a76bdee5047eb1a3f6a0dca803c8b0ec29f2
tree59ed315dd4c00455ed65d262fed4b425bc1e35eb
parentdf6016ccf4c87b09cd213c060b88a908fc08c7b4
parent329456d1ffb416c220813725b7363cda9975c9aa
Merge remote-tracking branch 'wireless/master'
drivers/bluetooth/btmrvl_sdio.c
drivers/ssb/driver_pcicore.c
net/mac80211/agg-tx.c