From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 5 Oct 2014 20:25:20 +0000 (+0200)
Subject: Merge branches 'acpi-pnp' and 'acpi-blacklist'
X-Git-Tag: fixes-against-v3.18-rc2~138^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbcbe68bb76c4f8057160209859ecd7c75e86c30;p=pandora-kernel.git

Merge branches 'acpi-pnp' and 'acpi-blacklist'

* acpi-pnp:
  ACPI / PNP: remove Fujitsu device IDs from ACPI PNP ID list

* acpi-blacklist:
  ACPI / blacklist: add Win8 OSI quirks for some Dell laptop models
---

dbcbe68bb76c4f8057160209859ecd7c75e86c30
Reading git-diff-tree failed