]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-acpi.bkbits.net/linux-acpi-release-2.6.4
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 6 Mar 2004 00:19:13 +0000 (16:19 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 6 Mar 2004 00:19:13 +0000 (16:19 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge