| commit | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Tue Oct 26 14:50:56 2010 -0400 |
| committer | Len Brown <len.brown@intel.com> | Tue Oct 26 14:50:56 2010 -0400 |
| tree | 6eae9454b9a30813b75cfa55680b7fc13a5e110c | |
| parent | 4895ae6f9f81011bf3a6fea70d46bab08d58fd8c [diff] | |
| parent | 4a3cba5e72a5232842ff7c1ca691ec3450af64b9 [diff] |
Merge branch 'acpi-mmio' into release Conflicts: drivers/acpi/osl.c Signed-off-by: Len Brown <len.brown@intel.com>