diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 18:20:50 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 18:20:50 +0100 |
commit | 5743695b0dd2c775b71d3d4541c243df3da964db (patch) | |
tree | 8220816fb97638642671bb66f1f2f02b0fb2f39d /drivers/scsi/pas16.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
parent | Input: lifebook - fix settings for CF-72 (diff) | |
download | linux-5743695b0dd2c775b71d3d4541c243df3da964db.tar.xz linux-5743695b0dd2c775b71d3d4541c243df3da964db.zip |
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 'drivers/scsi/pas16.h')
0 files changed, 0 insertions, 0 deletions