From: Linus Torvalds <torvalds@linux-foundation.org> Date: Thu, 18 Apr 2013 22:14:34 +0000 (-0700) Subject: Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a86d52667d8eda5de39393ce737794403bdce1eb;p=openwrt%2Fstaging%2Fblogic.git 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" --- a86d52667d8eda5de39393ce737794403bdce1eb