]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi
authorLinus Torvalds <torvalds@home.transmeta.com>
Tue, 26 Nov 2002 10:43:05 +0000 (02:43 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Tue, 26 Nov 2002 10:43:05 +0000 (02:43 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge