diff options
author | 2012-10-31 15:39:28 -0700 | |
---|---|---|
committer | 2012-10-31 15:39:28 -0700 | |
commit | 296bac30f6b62e1e985d3e7c0bd9c92b971b2dab (patch) | |
tree | 5c6fe90670524be4db95fd1f367f88e5c4c179bb /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
parent | HID: Add support for the MacBook Pro 10,2 keyboard / touchpad (diff) | |
download | linux-dev-296bac30f6b62e1e985d3e7c0bd9c92b971b2dab.tar.xz linux-dev-296bac30f6b62e1e985d3e7c0bd9c92b971b2dab.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina:
"This contains fixes for two devices by Jiri Slaby and Xianhan Yu, new
device IDs for MacBook Pro 10,2 from Dirk Hohndel and generic
multitouch code fix from Alan Cox."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Add support for the MacBook Pro 10,2 keyboard / touchpad
HID: multitouch: fix maxcontacts problem on GeneralTouch
HID: multitouch: put the case in the right switch statement
HID: microsoft: fix invalid rdesc for 3k kbd
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions