tree 7065f72e76919f571580378b3758acc1355564dd
parent ba933beb11b46b6d90d53b7220858148d8687ab1
parent ab96ddec7213004b632d24dc2cdcd2df5f16f50b
author Linus Torvalds <torvalds@linux-foundation.org> 1236532459 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1236532459 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: serio - fix protocol number for TouchIT213