]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi
authorLinus Torvalds <torvalds@home.transmeta.com>
Sat, 6 Apr 2002 08:39:32 +0000 (00:39 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sat, 6 Apr 2002 08:39:32 +0000 (00:39 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge