diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 19:25:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 19:25:27 (GMT) |
| commit | 22e93eddd9c63c61e5a38b82eea08f6095189e7f (patch) | |
| tree | c5b2816b7367288e402101eea338837789afc019 /include/linux/ftrace.h | |
| parent | 1cac6ec9b7f9c48a26309380656f399a0587b860 (diff) | |
| parent | 9b2fb2da4edfb163842800abbeb4c14bc1759469 (diff) | |
| download | linux-fsl-qoriq-22e93eddd9c63c61e5a38b82eea08f6095189e7f.tar.xz | |
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: ucb1400_ts - enable interrupt unconditionally
Input: ucb1400_ts - enable ADC Filter
Input: wacom - don't use on-stack memory for report buffers
Input: iforce - support new revision of ACT LABS Force RS
Input: joydev - decouple axis and button map ioctls from input constants
Diffstat (limited to 'include/linux/ftrace.h')
0 files changed, 0 insertions, 0 deletions