Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Aug 2012 15:16:58 +0000 (11:16 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Aug 2012 15:16:58 +0000 (11:16 -0400)
commite72615f6abde92e961feee13e1078a1352cde4f7
tree2327344aa361450be8349c74b67637ed32f070ce
parenta0dfb2634e5671770f598cda08002d8cda66ac77
parentc6b6eedc29dec8f779fd3420e8c62fd18e7b7c97
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem