summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-18 15:14:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-18 15:14:34 -0700
commita86d52667d8eda5de39393ce737794403bdce1eb (patch)
tree9f9bc84abe5fdfd6a27905fb35c08949a9bdfe0a /kernel
parent0a82a8d132b26d438eb90b3ab35a7016e7227a1d (diff)
parentc857b7f45b1f9fb7bad1eaa42b8ad68327738232 (diff)
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"
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions