]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi-release-2.6.0
authorLinus Torvalds <torvalds@home.osdl.org>
Wed, 1 Oct 2003 03:30:14 +0000 (20:30 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Wed, 1 Oct 2003 03:30:14 +0000 (20:30 -0700)
into home.osdl.org:/home/torvalds/v2.5/linux


Trivial merge