diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 12:37:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 12:37:54 -0700 |
| commit | cead24c1181ad199354bd08013d0f9d08b66691b (patch) | |
| tree | 24f46667109c731531dd7ecbc5054fef79f2b5c6 /init/main.c | |
| parent | a4be6c77b5fac7e0446452cc61656e8a01d27276 (diff) | |
| parent | 596264082f10dd4a567c43d4526b2f54ac5520bc (diff) | |
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 'init/main.c')
0 files changed, 0 insertions, 0 deletions