tree b041d08418a9c4699e08d79708220567ac4450ed
parent 1f86e8c1c9f129d450fd75e42d25ddba69a522ac
author Lv Zheng <lv.zheng@intel.com> 1351650352 +0000
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1352935883 +0100

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>