]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:30:42 +0000 (11:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:30:42 +0000 (11:30 +1100)
1  2 
drivers/net/wireless/ath/ath9k/rc.c
net/nfc/nci/core.c

Simple merge
Simple merge