tree 89dbd85a0a1882ae38e6b61e360b365c018195fd
parent 20f85957667ccc53183b5ffac22213d75e317408
parent b435fdcda126db42343b8055d04a0a27c229717b
author Linus Torvalds <torvalds@g5.osdl.org> 1161100603 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161100603 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: fm801-gp - handle errors from pci_enable_device()
  Input: gameport core - handle errors returned by device_bind_driver()
  Input: serio core - handle errors returned by device_bind_driver()
  Lockdep: fix compile error in drivers/input/serio/serio.c
  Input: serio - add lockdep annotations
  Lockdep: add lockdep_set_class_and_subclass() and lockdep_set_subclass()
  Input: atkbd - supress "too many keys" error message
  Input: i8042 - supress ACK/NAKs when blinking during panic
  Input: add missing exports to fix modular build