diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-05 09:22:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-05 09:22:38 -0700 |
commit | 538d2882213ef4f076108f3edda2c39a584c4c2b (patch) | |
tree | 130e954abe7c63a49b7a99fcac1dfacb5c5edc1d /fs/dlm/main.c | |
parent | 71277a6635890ab401f0a9dd7d5d9e652eea44ef (diff) | |
parent | d6069dae4700cf5290a75002c46b9be8ea7eef3c (diff) |
Merge branch 'for-linus' of git://github.com/dtor/input
* 'for-linus' of git://github.com/dtor/input:
Input: wacom - revert "Cintiq 21UX2 does not have menu strips"
Diffstat (limited to 'fs/dlm/main.c')
0 files changed, 0 insertions, 0 deletions