diff options
author | 2013-04-18 15:14:34 -0700 | |
---|---|---|
committer | 2013-04-18 15:14:34 -0700 | |
commit | a86d52667d8eda5de39393ce737794403bdce1eb (patch) | |
tree | 9f9bc84abe5fdfd6a27905fb35c08949a9bdfe0a /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Revert "block: add missing block_bio_complete() tracepoint" (diff) | |
parent | Revert "hp-wmi: Add support for SMBus hotkeys" (diff) | |
download | linux-dev-a86d52667d8eda5de39393ce737794403bdce1eb.tar.xz linux-dev-a86d52667d8eda5de39393ce737794403bdce1eb.zip |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions