]> 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>
Thu, 11 Aug 2011 17:37:26 +0000 (13:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 11 Aug 2011 17:37:26 +0000 (13:37 -0400)
commita06d8aba0e3f7faa30e95b12220b0c90bca41a07
tree1b12ea26f20199785e955ef67a28a25c6b042508
parentaa02bc7084501d2edecb0e5b9de56da070db19aa
parent059c4383550b158bc1b6d34d8ab085e81cb3d71b
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem