]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 23:41:46 +0000 (10:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 23:41:46 +0000 (10:41 +1100)
1  2 
drivers/net/wireless/rtlwifi/ps.c
net/mac80211/agg-tx.c

Simple merge
Simple merge