tree d67acdb4315e611fadc64975fd1467b2389d412d
parent 41c57a87183a7c458d86f78966d69d4bf18ea0b7
parent 76398f9667e8369023ed5f4847fb59e9da8b6968
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1170205328 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1170205328 -0800

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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  HID: fix pb_fnmode and move it to generic HID
  HID: fix hid-input mapping for Firefly Mini Remote Control
  USB HID: fix hid_blacklist clash for 0x08ca/0x0010
  HID: fix memleaking of collection