Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Jul 2012 15:15:03 +0000 (11:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Jul 2012 15:15:03 +0000 (11:15 -0400)
commit28ea499ac5b90f6266a24b826c6d469fc503758c
tree62dc50b7ce3fb735f125762c8134dd778024812b
parent6ee127b7dd63afe4d6d0a58293786bf4bf336850
parent9dbf5f55f8d35ff9aedc75267f4e4042aaf89755
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem