Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 4 Jan 2012 16:37:30 +0000 (11:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 4 Jan 2012 16:37:30 +0000 (11:37 -0500)
commitd8f46ff11081f03b09efe82245a3257bab6bf60e
treefe47a5fe5ef62920ee3e1ffe5a2fd7a29918c6b0
parent405cc2736527bd506fd8f652308b03b2c8a1e8b9
parentb015dbc0f95eef34819515bd403a62569bca23df
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem