diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 09:20:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 09:20:50 -0800 |
| commit | 5743695b0dd2c775b71d3d4541c243df3da964db (patch) | |
| tree | 8220816fb97638642671bb66f1f2f02b0fb2f39d /fs/lockd/clntlock.c | |
| parent | 8a1eaa6a5697c4554ecacbd021c668f51318c09e (diff) | |
| parent | b1e69aae77d02424ad67f337e40d439313554269 (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/lockd/clntlock.c')
0 files changed, 0 insertions, 0 deletions