]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-acpi.bkbits.net/linux-acpi-release-2.6.2
authorLinus Torvalds <torvalds@home.osdl.org>
Mon, 26 Jan 2004 14:09:58 +0000 (06:09 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Mon, 26 Jan 2004 14:09:58 +0000 (06:09 -0800)
into home.osdl.org:/home/torvalds/v2.5/linux

1  2 
arch/i386/kernel/dmi_scan.c

Simple merge