Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Aug 2011 14:33:51 +0000 (10:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Aug 2011 14:33:51 +0000 (10:33 -0400)
commite2e6be56df37c371f564e127c154036b0c2211a1
tree6687fc0340c20a76972bcaf5c665364c1074aee8
parentbc909d9ddbf7778371e36a651d6e4194b1cc7d4c
parent8b2a3827bb12430d932cd479b22d906baf08c212
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem