diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 20:50:56 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 20:50:56 +0200 |
| commit | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (patch) | |
| tree | 6eae9454b9a30813b75cfa55680b7fc13a5e110c /include/acpi/acpiosxf.h | |
| parent | Merge branch 'ec-param' into release (diff) | |
| parent | ACPI: Page based coalescing of I/O remappings optimization (diff) | |
| download | linux-1bd64d42abdd4f9d44f77011a31f0292112f4c3b.tar.xz linux-1bd64d42abdd4f9d44f77011a31f0292112f4c3b.zip | |
Merge branch 'acpi-mmio' into release
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpiosxf.h')
0 files changed, 0 insertions, 0 deletions