ACPI: fix git automerge failure
authorLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 05:59:38 +0000 (00:59 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 16 Dec 2006 05:59:38 +0000 (00:59 -0500)
Signed-off-by: Len Brown <len.brown@intel.com>

No differences found