]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-acpi.bkbits.net/to-linus
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 17 Feb 2005 02:09:41 +0000 (18:09 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 17 Feb 2005 02:09:41 +0000 (18:09 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge