Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Apr 2008 17:10:37 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Apr 2008 17:10:37 +0000 (10:10 -0700)
commitcf867ac375cea7c7a834eaddaf373e2662d9e260
tree09c47547433f088c29b74d401142d0629ce2dde1
parent2d630d1a6827bb7266dcd8bba5f99fac2505ee97
parent20430214cc0073dc7e817b032e32ae2ae54b4911
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: xpad - fix build failure
drivers/input/joystick/xpad.c