]> 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>
Sat, 22 Sep 2012 16:19:22 +0000 (12:19 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 22 Sep 2012 16:19:22 +0000 (12:19 -0400)
commit1199992df2417dc9a1db1b19930ea4d0a697a61e
tree4d0c187a1fe17e3f3745011c6fd2fa6c588e24d9
parentabef3bd71029b80ec1bdd6c6244b5b0b99f56633
parenta7be50b7e30f9d77cb059a7ffdb781bb0fb92eba
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem