tree 8220816fb97638642671bb66f1f2f02b0fb2f39d
parent 8a1eaa6a5697c4554ecacbd021c668f51318c09e
parent b1e69aae77d02424ad67f337e40d439313554269
author Linus Torvalds <torvalds@linux-foundation.org> 1258478450 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1258478450 -0800

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: lifebook - fix settings for CF-72
  Input: psmouse - fix breakage introduced by b7802c5c1ea