]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 1 Nov 2002 05:03:37 +0000 (21:03 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 1 Nov 2002 05:03:37 +0000 (21:03 -0800)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge