]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi-release-2.6.0
authorLinus Torvalds <torvalds@home.osdl.org>
Tue, 21 Oct 2003 14:31:35 +0000 (07:31 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Tue, 21 Oct 2003 14:31:35 +0000 (07:31 -0700)
into home.osdl.org:/home/torvalds/v2.5/linux


Trivial merge