]> 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>
Mon, 19 Aug 2013 18:24:45 +0000 (14:24 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Aug 2013 18:24:45 +0000 (14:24 -0400)
commit22f0d2d1e7e76758f75887e616f2976323f85c26
tree9470a4a7f4fe9deac91bd5bba2dbd9bfd6e7c84d
parent0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a
parent48c3e371350701444db51e8b35b5928d74dbacc3
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem