]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.5
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 1 Apr 2004 07:02:19 +0000 (23:02 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 1 Apr 2004 07:02:19 +0000 (23:02 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge