]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 6 Dec 2002 03:27:25 +0000 (19:27 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 6 Dec 2002 03:27:25 +0000 (19:27 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge