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)
commit42a3b63bb2ca4996a3d1210a004eae2333f1119e
treef61c88fb4483bf75f557105a889e256a4f325c0d
parent3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f
parent78feb35b8161acd95c33a703ed6ab6f554d29387
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/net/wireless/ath/ath9k/rc.c
net/nfc/nci/core.c