]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 23:27:22 +0000 (10:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 23:27:22 +0000 (10:27 +1100)
1  2 
drivers/net/wireless/ath/regd.c
net/mac80211/mlme.c

Simple merge
Simple merge