Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Jun 2011 16:40:36 +0000 (12:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Jun 2011 16:40:36 +0000 (12:40 -0400)
commit82362ccbf259b960192019deb562bf84549e3d1d
treefee34ec77d908cd32907553eed0f10fb30061708
parent118133e6580a0c912cda86109b6468b5ffe73f1c
parent3373b28e5af4a0b3c6cb39372581dcc1e41322ff
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6 into for-davem