Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Sat, 22 Sep 2012 16:19:22 +0000 (12:19 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 22 Sep 2012 16:19:22 +0000 (12:19 -0400)
commitc9b4bc072db59e8f76b930181f4d052dde8a20cc
tree4d0c187a1fe17e3f3745011c6fd2fa6c588e24d9
parent089425d82052aa39d7960cea44e2bdb935b1fdcb
parentd1118ed372e6db14c2f6801041281adf2cc8f6dc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem