]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:25:57 +0000 (13:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:25:57 +0000 (13:25 +1100)
1  2 
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/agg-tx.c

Simple merge