Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Oct 2013 15:19:05 +0000 (11:19 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Oct 2013 15:19:05 +0000 (11:19 -0400)
commitb26082b9945a9aca85d51be37824f852617c7129
tree4e3417a5103e7f844a4316fba013287f37fdc7d8
parent9684d7b0dab3cf3a897edd85dca501d413888d56
parentd107babca27f3c08e399616483e4c5f010bd24d3
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem