Merge branch 'acpi-mmio' into release
authorLen Brown <len.brown@intel.com>
Tue, 26 Oct 2010 18:50:56 +0000 (14:50 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 26 Oct 2010 18:50:56 +0000 (14:50 -0400)
commit1bd64d42abdd4f9d44f77011a31f0292112f4c3b
tree6eae9454b9a30813b75cfa55680b7fc13a5e110c
parent4895ae6f9f81011bf3a6fea70d46bab08d58fd8c
parent4a3cba5e72a5232842ff7c1ca691ec3450af64b9
Merge branch 'acpi-mmio' into release

Conflicts:
drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/osl.c