diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-16 17:33:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-16 17:33:44 +0100 |
| commit | 9fe4145530e6072cc838beb95ca68cada8c56909 (patch) | |
| tree | 72d0c2d45bb92e75f3a0b4e102fbee2904dea4c0 /fs/nfs/nfs2xdr.c | |
| parent | Linux 2.6.37-rc6 (diff) | |
| parent | Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 (diff) | |
| download | linux-9fe4145530e6072cc838beb95ca68cada8c56909.tar.xz linux-9fe4145530e6072cc838beb95ca68cada8c56909.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: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
Input: wacom - add another Bamboo Pen ID (0xd4)
Diffstat (limited to 'fs/nfs/nfs2xdr.c')
0 files changed, 0 insertions, 0 deletions