From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 16 Oct 2013 15:04:41 +0000 (+0200)
Subject: Merge branch 'acpi-conversion' into acpi-assorted
X-Git-Tag: v3.13-rc1~96^2~19^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ad8568c81979be9c115d22ff1c3580f5ecd0bb;p=pandora-kernel.git

Merge branch 'acpi-conversion' into acpi-assorted

The following commits depend on the 'acpi-conversion' material.

Conflicts:
	drivers/acpi/acpi_platform.c
---

c0ad8568c81979be9c115d22ff1c3580f5ecd0bb
Reading git-diff-tree failed