Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
commit2a50b2560ee956808da0b644cb529608dee65274
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:14:19 +0000 (8 10:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:14:19 +0000 (8 10:14 -0700)
tree7065f72e76919f571580378b3758acc1355564dd
parentba933beb11b46b6d90d53b7220858148d8687ab1
parentab96ddec7213004b632d24dc2cdcd2df5f16f50b
Merge branch 'for-linus' of git://git./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