]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:06:19 +0000 (11:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:06:19 +0000 (11:06 +1100)
commit03b14f917ba3255d4649341c68268d6ddc00ecae
tree66ae49da19e2a331f47198b22bf1c5ab484776cb
parentea586791661873d31862ea682a36b664cde8e13b
parent10636bc2d60942254bda149827b922c41f4cb4af
Merge remote-tracking branch 'wireless/master'
drivers/net/wireless/ath/ath9k/rc.c
net/nfc/nci/core.c