git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f86e8c)
ACPICA: Fix unmerged acmacros.h divergences.
authorLv Zheng <lv.zheng@intel.com>
Wed, 31 Oct 2012 02:25:52 +0000 (02:25 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Nov 2012 23:31:23 +0000 (00:31 +0100)
The 20121018 release depends on some unmerged acmaros.h fixes.
This patch includes the fixes made on acmaros.h that will not affect
the generated vmlinux binary.

This patch will not affect the generated vmlinux binary.
This will decrease 157 lines of 20120913 divergence.diff.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/acmacros.h patch | blob | history
drivers/acpi/acpica/psloop.c patch | blob | history

diff --cc drivers/acpi/acpica/acmacros.h
Simple merge
diff --cc drivers/acpi/acpica/psloop.c
Simple merge
Pandora Kernel Repository