From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Aug 2013 20:04:11 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a7492a4b2e05051a44458d7187023e22d580666;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver fixes from Matthew Garrett:
 "Three trivial fixes - the first reverts a patch that's broken some
  other devices (again - I'm trying to figure out a clean way to
  implement this), the other two fix minor issues in the sony-laptop
  driver"

* 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86:
  Revert "hp-wmi: Enable hotkeys on some systems"
  sony-laptop: Fix reporting of gfx_switch_status
  sony-laptop: return a negative error code in sonypi_compat_init()
---

6a7492a4b2e05051a44458d7187023e22d580666