]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1f86e8c) | patch
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)
commit86ff0e508f88eda6e479a897476026055831d2d8
treeb041d08418a9c4699e08d79708220567ac4450edtree | snapshot
parent1f86e8c1c9f129d450fd75e42d25ddba69a522accommit | diff
ACPICA: Fix unmerged acmacros.h divergences.

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 diff | blob | history
drivers/acpi/acpica/psloop.c diff | blob | history
Andy's Linux Kernel repo