Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Jul 2011 15:01:31 +0000 (11:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Jul 2011 15:01:31 +0000 (11:01 -0400)
commit8a98d935c4b8b3515d1403d150e282f95b9f558d
treee891deb720a12aa2cf52ad9efc025e12bdcde787
parentf8d9605243280f1870dd2c6c37a735b925c15f3c
parent34459512ffa7236c849466e3bd604801389734e1
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6 into for-davem