Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 31 Oct 2012 17:10:01 +0000 (13:10 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 31 Oct 2012 17:10:01 +0000 (13:10 -0400)
commit06272911485850b4a336122958c50af0f8ea7c13
treece1e4ada8e6adc9cb9235cd0b50ed1350604a02a
parente657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6
parent6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem