]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.5
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 14 Mar 2004 01:11:57 +0000 (17:11 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 14 Mar 2004 01:11:57 +0000 (17:11 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux


Trivial merge