From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Aug 2014 16:38:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.17-rc3~27
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ff0c57ac70434bc936cb0110eaf033a0a1a62e52;p=karo-tx-linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - fixes for potential memory corruption problems in magicmouse and
   picolcd drivers (the HW would have to be manufactured to be
   deliberately evil to trigger those) which were found by Steven
   Vittitoe

 - fix for false error message appearing in dmesg from logitech-dj
   driver, from Benjamin Tissoires

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: picolcd: sanity check report size in raw_event() callback
  HID: magicmouse: sanity check report size in raw_event() callback
  HID: logitech-dj: prevent false errors to be shown
---

ff0c57ac70434bc936cb0110eaf033a0a1a62e52