diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:19:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:19:18 -0700 |
commit | cc491e27d31f1bb3dacb309407b47d65669ceb9d (patch) | |
tree | 9596fd035919fe9204a275f60044236dbbdd01a2 /fs/ocfs2/ioctl.h | |
parent | 2c20130f200b8f9aa746b7c7bc265ab129c29ead (diff) | |
parent | af045b86662f17bf130239a65995c61a34f00a6b (diff) | |
download | kernel_samsung_smdk4412-cc491e27d31f1bb3dacb309407b47d65669ceb9d.tar.gz kernel_samsung_smdk4412-cc491e27d31f1bb3dacb309407b47d65669ceb9d.tar.bz2 kernel_samsung_smdk4412-cc491e27d31f1bb3dacb309407b47d65669ceb9d.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: i8042 - fix device removal on unload
Input: bcm5974 - adjust major/minor to scale
Input: MT - initialize slots to unused
Input: use PIT_TICK_RATE in vt beep ioctl
Input: wacom - fix mousewheel handling for old wacom tablets
Diffstat (limited to 'fs/ocfs2/ioctl.h')
0 files changed, 0 insertions, 0 deletions