Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Aug 2013 20:04:11 +0000 (13:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Aug 2013 20:04:11 +0000 (13:04 -0700)
commit6a7492a4b2e05051a44458d7187023e22d580666
tree69ae9f3065871611a1ce798682516b6542d3f0e5
parent1f8b76656be831d1c6239bd36ef988d5b185b5ab
parent41c8bd1c75ef8e8566eca6b1c7bc273bc282f495
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()