]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:01:32 +0000 (11:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:01:32 +0000 (11:01 +1100)
commit5e7dbabaec0bcf33a34706f0cb4027f144a0ce96
treee456e5c9c824c5a02d3eb95a3d8448512aed0659
parenta06f8802a8f658f3275e31239adedae119acaf8a
parent2a1e0fd175dcfd72096ba9291d31e3b1b5342e60
Merge remote-tracking branch 'wireless/master'
drivers/net/wireless/rtlwifi/ps.c
net/mac80211/agg-tx.c