]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Sep 2005 20:49:37 +0000 (13:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Sep 2005 20:49:37 +0000 (13:49 -0700)

Trivial merge