5232842ff7c1ca691ec3450af64b9
author Len Brown <len.brown@intel.com> 1288119056 -0400
committer Len Brown <len.brown@intel.com> 1288119056 -0400

Merge branch 'acpi-mmio' into release

Conflicts:
	drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
}×u(•=x