Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Dec 2013 14:29:56 +0000 (09:29 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Dec 2013 14:29:56 +0000 (09:29 -0500)
commitaa489f0f268595bd33d9649030bd1a43c28927a0
tree598cb96d4b22749e07116cb4006d71fb5a5704ea
parent988bf4f01e6a1eefdedd76e961044f01fe6a304c
parenta59b40b30f3f51bf5c56c15a7dc4da11b424a34b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem