]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.8
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 22 Aug 2004 05:34:04 +0000 (22:34 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 22 Aug 2004 05:34:04 +0000 (22:34 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge