From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Nov 2009 17:20:50 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.32-rc8~24
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5743695b0dd2c775b71d3d4541c243df3da964db;p=linux-2.6-block.git

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

5743695b0dd2c775b71d3d4541c243df3da964db