]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.7
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 20 May 2004 05:53:13 +0000 (22:53 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 20 May 2004 05:53:13 +0000 (22:53 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge