]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Aug 2012 18:05:38 +0000 (14:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Aug 2012 18:05:38 +0000 (14:05 -0400)
commit039aafba1b57ed39acb3abc290c11be37402feb2
treeb8c07e7204d07f47921e5c64b068a88eb8457747
parent63d02d157ec4124990258d66517b6c11fd6df0cf
parent50e2a30cf6fcaeb2d27360ba614dd169a10041c5
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem