diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-30 21:55:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-30 21:55:22 -0700 |
| commit | 644b55ce889edd37d6406df26e2d96d7a7390749 (patch) | |
| tree | 9dc34216c5cf4c65d789fb2695289e09324558d4 /drivers/acpi | |
| parent | feabb06bd70551668540f2305047675667f5f60f (diff) | |
| parent | b3e2c70cd0d05fb6621521521fbd5debed57d753 (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: 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 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions