tree 9f9bc84abe5fdfd6a27905fb35c08949a9bdfe0a
parent 0a82a8d132b26d438eb90b3ab35a7016e7227a1d
parent c857b7f45b1f9fb7bad1eaa42b8ad68327738232
author Linus Torvalds <torvalds@linux-foundation.org> 1366323274 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1366323274 -0700

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

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"