aboutsummaryrefslogtreecommitdiff
path: root/include/asm-frv/ioctl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-08 10:14:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-08 10:14:19 -0700
commit2a50b2560ee956808da0b644cb529608dee65274 (patch)
tree7065f72e76919f571580378b3758acc1355564dd /include/asm-frv/ioctl.h
parentba933beb11b46b6d90d53b7220858148d8687ab1 (diff)
parentab96ddec7213004b632d24dc2cdcd2df5f16f50b (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: serio - fix protocol number for TouchIT213
Diffstat (limited to 'include/asm-frv/ioctl.h')
0 files changed, 0 insertions, 0 deletions