]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Dec 2011 18:47:58 +0000 (13:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Dec 2011 18:47:58 +0000 (13:47 -0500)
1  2 
drivers/net/wireless/ath/ath9k/rc.c
net/nfc/nci/core.c

Simple merge
Simple merge