Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Feb 2012 19:14:07 +0000 (14:14 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Feb 2012 19:14:07 +0000 (14:14 -0500)
commit157ca9eae92bc5247f93bea4ecb50dfacc283a04
tree2bf88c36d1a7513c3dbb2babd6feb64ed2ce558c
parent29830406415c227a54af429d7b300aabd4754237
parent07ae2dfcf4f7143ce191c6436da1c33f179af0d6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem