summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-primax.c
diff options
context:
space:
mode:
authorLinus Torvalds2012-09-22 21:37:54 +0200
committerLinus Torvalds2012-09-22 21:37:54 +0200
commitcead24c1181ad199354bd08013d0f9d08b66691b (patch)
tree24f46667109c731531dd7ecbc5054fef79f2b5c6 /drivers/hid/hid-primax.c
parentMerge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 (diff)
parentHID: Fix logitech-dj: missing Unifying device issue (diff)
downloadkernel-qcow2-linux-cead24c1181ad199354bd08013d0f9d08b66691b.tar.gz
kernel-qcow2-linux-cead24c1181ad199354bd08013d0f9d08b66691b.tar.xz
kernel-qcow2-linux-cead24c1181ad199354bd08013d0f9d08b66691b.zip
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina: "The most important fix is Logitech Unifying receiver regression in device enumeration fix from Nestor Lopez Casado. In addition to that, there is a small memory leak fix for Thinkpad keyboard driver from Axel Lin." * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Fix logitech-dj: missing Unifying device issue HID: lenovo-tpkbd: Fix memory leak in tpkbd_remove_tp()
Diffstat (limited to 'drivers/hid/hid-primax.c')
0 files changed, 0 insertions, 0 deletions