diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 22:12:23 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 22:14:02 +0200 |
| commit | 73f05330497b98c45d157b7d0c60673798bb4c3b (patch) | |
| tree | 67fc16c0f55c482882aea49eaa1d8d95b23722e0 /usr/gen_init_cpio.c | |
| parent | Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'mis... (diff) | |
| parent | ACPI: Fix logic for removing mappings in 'acpi_unmap' (diff) | |
| download | linux-73f05330497b98c45d157b7d0c60673798bb4c3b.tar.xz linux-73f05330497b98c45d157b7d0c60673798bb4c3b.zip | |
Merge branch 'apei' into release
Conflicts:
drivers/acpi/apei/apei-base.c
This was a conflict between
15afae604651d4e17652d2ffb56f5e36f991cfef
(CPI, APEI: Fix incorrect APEI register bit width check and usage)
and
653f4b538f66d37db560e0f56af08117136d29b7
(ACPICA: Expand OSL memory read/write interfaces to 64 bits)
The former changed a parameter in the call to acpi_os_read_memory64()
and the later replaced all calls to acpi_os_read_memory64()
with calls to acpi_os_read_memory().
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'usr/gen_init_cpio.c')
0 files changed, 0 insertions, 0 deletions