]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorJody McIntyre <scjody@modernduck.com>
Fri, 18 Nov 2005 20:16:15 +0000 (15:16 -0500)
committerJody McIntyre <scjody@modernduck.com>
Fri, 18 Nov 2005 20:16:15 +0000 (15:16 -0500)

Trivial merge