Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Feb 2012 19:53:43 +0000 (14:53 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Feb 2012 19:53:43 +0000 (14:53 -0500)
commit7a73b08b50b075b114d0f608099e4634f9c73ae7
treec422dce59ce7fa9a4ebf8f7512bb3879a3b83ed0
parenta1728800bed3b93b231d99e97c756f622b9991c2
parente81a7bd55531a77d8c16d44766db4089c2983f1b
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem