Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 14 Nov 2013 18:42:17 +0000 (13:42 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 14 Nov 2013 18:42:17 +0000 (13:42 -0500)
commitd8ec5a5d4c63e308beb20b09a05bb8ea3093bedb
tree9da95c789ca01831a546c9caa1db64d3521569ad
parent6115c11fe1a5a636ac99fc823b00df4ff3c0674e
parent8e3ffa471091c560deb6738ed9ab7445b7a5fd04
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem