[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
[powerpc.git] / drivers / acpi / resources / rsmemory.c
2005-07-12 Robert MooreACPICA 20050408 from Bob Moore
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2