Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6
[linux-2.6] / drivers / acpi / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2