tree d69f821381995a7d377283f962583075dc149739
parent a240d9f1d8e6421cb970632b93e71b2f66c2cd70
parent 4ef4caad41630c7caa6e2b94c6e7dda7e9689714
author Linus Torvalds <torvalds@woody.osdl.org> 1166553160 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1166553160 -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:
  [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