]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 01:55:35 +0000 (11:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 01:55:35 +0000 (11:55 +1000)
1  2 
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/rt2x00/rt2800lib.c

Simple merge