aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-17 09:20:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-17 09:20:50 -0800
commit5743695b0dd2c775b71d3d4541c243df3da964db (patch)
tree8220816fb97638642671bb66f1f2f02b0fb2f39d /fs
parent8a1eaa6a5697c4554ecacbd021c668f51318c09e (diff)
parentb1e69aae77d02424ad67f337e40d439313554269 (diff)
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions