]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Dec 2005 00:21:48 +0000 (16:21 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 15 Dec 2005 00:21:48 +0000 (16:21 -0800)

Trivial merge