From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 31 Jan 2007 01:02:08 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.20-rc7~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4222721ebb50a8640860eeca0caeb63fe1cce935;p=linux-2.6

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
---

4222721ebb50a8640860eeca0caeb63fe1cce935