diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 21:37:54 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 21:37:54 +0200 |
commit | cead24c1181ad199354bd08013d0f9d08b66691b (patch) | |
tree | 24f46667109c731531dd7ecbc5054fef79f2b5c6 /drivers/hid/Makefile | |
parent | Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
parent | HID: Fix logitech-dj: missing Unifying device issue (diff) | |
download | linux-cead24c1181ad199354bd08013d0f9d08b66691b.tar.xz 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/Makefile')
0 files changed, 0 insertions, 0 deletions