Automatic merge of 'for-linus' branch from
[linux-2.6] / include / linux / acpi.h
2005-05-27  Linus TorvaldsMerge ... /pub/scm/linux/kernel/git/hch/xfs-2.6
2005-05-27  Len Brown[PATCH] VIA IRQ quirk
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2