]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Automatic merge of kernel.org:/home/rmk/linux-2.6-rmk.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 15:58:22 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 15:58:22 +0000 (08:58 -0700)

Trivial merge