projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a82a8d c857b7f)
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Apr 2013 22:14:34 +0000 (15:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Apr 2013 22:14:34 +0000 (15:14 -0700)
Pull x86 platform driver revert from Matthew Garrett:
 "It turns out that one of the hp-wmi patches this cycle breaks some
  other HP laptops.  I think we have a good idea how to work on it for
  3.10, but it's safer to just revert it for now."

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  Revert "hp-wmi: Add support for SMBus hotkeys"


Trivial merge
Domain: System / Kernel;