Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 14:57:00 +0000 (07:57 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 14:57:00 +0000 (07:57 -0700)
commit532df780a2012ad75b3f078647f229c4dabd99d1
tree6172d647f9c7bbd770bcd5f9f002108d671ce24f
parent577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d
parent7b6dff982b063b1b15c30508f16863e5449e7229
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: usbtouchscreen - correctly set 'phys'
  Input: i8042 - add HP Pavilion DV4270ca to the MUX blacklist
  Input: i8042 - fix modpost warning
  Input: add more Braille keycodes
include/linux/input.h