diff options
author | 2013-08-22 13:04:11 -0700 | |
---|---|---|
committer | 2013-08-22 13:04:11 -0700 | |
commit | 6a7492a4b2e05051a44458d7187023e22d580666 (patch) | |
tree | 69ae9f3065871611a1ce798682516b6542d3f0e5 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
parent | Revert "hp-wmi: Enable hotkeys on some systems" (diff) | |
download | linux-dev-6a7492a4b2e05051a44458d7187023e22d580666.tar.xz linux-dev-6a7492a4b2e05051a44458d7187023e22d580666.zip |
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver fixes from Matthew Garrett:
"Three trivial fixes - the first reverts a patch that's broken some
other devices (again - I'm trying to figure out a clean way to
implement this), the other two fix minor issues in the sony-laptop
driver"
* 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86:
Revert "hp-wmi: Enable hotkeys on some systems"
sony-laptop: Fix reporting of gfx_switch_status
sony-laptop: return a negative error code in sonypi_compat_init()
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions