tree 8a055fa5690a01b35ab7294e699114821a5f671c
parent 1fb00cbca05ba13f386e75aa1f6d801895cfed29
parent 844817e47eef14141cf59b8d5ac08dd11c0a9189
author Linus Torvalds <torvalds@linux-foundation.org> 1409157486 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1409157486 -0700

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