From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Sep 2012 19:37:54 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.12-rc1~2374
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cead24c1181ad199354bd08013d0f9d08b66691b;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-fixes' of git://git./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()
---

cead24c1181ad199354bd08013d0f9d08b66691b