diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 06:55:22 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 06:55:22 +0200 |
commit | 644b55ce889edd37d6406df26e2d96d7a7390749 (patch) | |
tree | 9dc34216c5cf4c65d789fb2695289e09324558d4 /mm/tiny-shmem.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | Input: psmouse - make dummy touchkit_ps2_detect() static (diff) | |
download | linux-644b55ce889edd37d6406df26e2d96d7a7390749.tar.xz linux-644b55ce889edd37d6406df26e2d96d7a7390749.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: psmouse - make dummy touchkit_ps2_detect() static
Input: gscps2 - convert to use kzalloc
Input: iforce - fix 'unused variable' warning
Input: i8042 - fix retrun value of i8042_aux_test_irq
Input: gpio_keys - remove duplicate includes
Diffstat (limited to 'mm/tiny-shmem.c')
0 files changed, 0 insertions, 0 deletions