From: Lv Zheng <lv.zheng@intel.com>
Date: Thu, 8 Aug 2013 07:29:46 +0000 (+0800)
Subject: ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version.
X-Git-Tag: v3.12-rc1~178^2~13^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2641f540800b47a1b9e9d8ce9d682fc15df088e2;p=pandora-kernel.git

ACPICA: Fix divergences of the commit - ACPICA: Expose OSI version.

The original commit 242b2287cd7f27521c8b54a4101d569e53e7a0ca "ACPICA:
expose OSI version" triggers build errors in ACPICA when it is back
ported.  The patch removes the divergences between Linux and upstream
ACPICA resulting from that.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

Reading git-diff-tree failed