Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 8 Aug 2013 17:12:42 +0000 (13:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 Aug 2013 17:12:42 +0000 (13:12 -0400)
commit1826ff2357d69d3a2627df51e4ba07d24087b698
tree89d1f8610c20b32cf9ed491e7509b0ae941643f4
parent3e3be275851bc6fc90bfdcd732cd95563acd982b
parent5a6e0cf70743f30c17ccb5f228db9a124b0e7477
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem