ACPICA: reduce conflicts with Altix patch series
commit647fb47dfabeffd2f1706013ebf5cfc92b70d273
authorLen Brown <len.brown@intel.com>
Sat, 3 Feb 2007 03:14:22 +0000 (2 22:14 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 3 Feb 2007 03:14:22 +0000 (2 22:14 -0500)
tree267da299effc23a4594a190d1c842bd900b7517b
parentdefad23020bb7701b3ad414135c73fc03054507b
ACPICA: reduce conflicts with Altix patch series

Syntax only -- no functional changes.

Signed-off-by: Len Brown <len.brown@intel.com>
arch/ia64/sn/kernel/io_common.c
arch/ia64/sn/kernel/iomv.c
include/asm-ia64/sn/acpi.h [new file with mode: 0644]