Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
commitd39c9400ae0d60aaaf534b1ad860a9bc1413d8af
authorLinus Torvalds <torvalds@woody.osdl.org>
Fri, 12 Jan 2007 02:26:28 +0000 (11 18:26 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 12 Jan 2007 02:26:28 +0000 (11 18:26 -0800)
treef4d0c6aa0f7b556be324b5b1657467980225b769
parente947382ed38563544d2b5b79f6ea90bdde350e5e
parent531498013163c72cee8540e98e12c0c430c7fe87
Merge branch 'for-linus' of /linux/kernel/git/jikos/hid

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  HID: Fix DRIVER_DESC macro
  HID: mousepoll parameter makes no sense for generic HID
  HID: tiny patch to remove a kmalloc cast
  HID: fix mappings for DiNovo Edge Keyboard - Logitech USB BT receiver