]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commite8a3b6b47e8a2d84864b357459d8d177d7f7f754
tree77067d2a027549ac6a1cd76c5f8f9360eb7b7f58
parente7adfe5236f74d8af0120398d43ca1a220170c25
parent2a1e0fd175dcfd72096ba9291d31e3b1b5342e60
Merge remote-tracking branch 'wireless/master'
drivers/net/wireless/rtlwifi/ps.c
net/mac80211/agg-tx.c