]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:26:34 +0000 (14:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:26:34 +0000 (14:26 -0500)
commit0511af9e9a43c64dd7e23e642c9087710688768c
tree746abc859aa16fbc0f0cfd2c440cf9513564dac6
parent782a9e31e81956a271375c0ba8d46fbb0480983e
parent003ea98195eebdfcf476317b517e8c29a25b9d10
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6