commit a86d52667d8eda5de39393ce737794403bdce1eb
Merge: 0a82a8d c857b7f
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Apr 18 15:14:34 2013 -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"