tree e439df35a39c06df3665ec30b406406f08e82177
parent 4e3d0319451805cffa69bdb1352f1c9817bf28bc
parent 5906a0448208024d140e1ee0e65f9168a405fb94
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203053422 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203053422 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: add USB IDs for MacBook 3rd generation
  HID: add LCSPEC from VERNIER to quirk list
  HID: fix processing of event quirks
  HID: Blacklist new GTCO CalComp USB device PIDs