diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-16 08:33:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-16 08:33:44 -0800 |
| commit | 9fe4145530e6072cc838beb95ca68cada8c56909 (patch) | |
| tree | 72d0c2d45bb92e75f3a0b4e102fbee2904dea4c0 /drivers/dma/shdma.c | |
| parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
| parent | ab4e0192196b8d4e43a3945742d4996da934a86f (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: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2
Input: wacom - add another Bamboo Pen ID (0xd4)
Diffstat (limited to 'drivers/dma/shdma.c')
0 files changed, 0 insertions, 0 deletions