Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 19 Dec 2006 18:32:40 +0000 (10:32 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 19 Dec 2006 18:32:40 +0000 (10:32 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  [PATCH] Generic HID layer - update MAINTAINERS
  input/hid: Supporting more keys from the HUT Consumer Page
  [PATCH] Generic HID layer - build: USB_HID should select HID


Trivial merge