From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 10:59:02 +0000 (+0200)
Subject: Merge branch 'acpi-lpss'
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~19^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c9f402389977dc852ef4848c7615926306735d;p=pandora-kernel.git

Merge branch 'acpi-lpss'

* acpi-lpss:
  ACPI / LPSS: override SDIO private register space size from ACPI tables
  ACPI / LPSS: mask the UART TX completion interrupt
  ACPI / LPSS: add support for Intel BayTrail

Conflicts:
	drivers/acpi/acpi_lpss.c (with commit b9e95fc)
---

f4c9f402389977dc852ef4848c7615926306735d
Reading git-diff-tree failed