Colin Cross 98959c8563 Merge branch 'android-2.6.36' into android-tegra-2.6.36 ...

Conflicts:
	drivers/input/touchscreen/Kconfig

Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02

2010-10-06 16:32:09 -07:00

..

gameport

Merge commit 'v2.6.34-rc6' into core/locking

2010-05-03 09:17:01 +02:00

joystick

Input: fix faulty XXinput_* calls

2010-08-13 12:03:24 -07:00

keyboard

Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()

2010-08-25 07:51:40 -07:00

misc

input: gpio_event: make driver be more robust against incorrectly configured lvl trigger irqs

2010-09-29 17:49:42 -07:00

mouse

Input: bcm5974 - adjust major/minor to scale

2010-08-31 18:00:02 -07:00

serio

Input: i8042 - fix device removal on unload

2010-08-31 18:28:15 -07:00

tablet

Input: wacom - fix mousewheel handling for old wacom tablets

2010-08-28 21:39:04 -07:00

touchscreen

Merge branch 'android-2.6.36' into android-tegra-2.6.36

2010-10-06 16:32:09 -07:00

apm-power.c

Input: apm-power - fix crash when unloading modules

2008-03-24 11:02:06 -04:00

evbug.c

Input: struct device - replace bus_id with dev_name(), dev_set_name()

2008-10-30 09:29:05 -04:00

evdev.c

input: evdev: Use unique wakelock names

2010-09-29 17:49:09 -07:00

ff-core.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ff-memless.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

fixp-arith.h

changed email

2007-10-20 00:47:32 +02:00

input-compat.c

Input: refactor evdev 32bit compat to be shareable with uinput

2008-10-27 22:03:42 -04:00

input-compat.h

[IA64] Remove COMPAT_IA32 support

2010-02-08 10:42:17 -08:00

input-polldev.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

input.c

Input: MT - initialize slots to unused

2010-08-28 21:39:43 -07:00

joydev.c

Input: switch to input_abs_*() access functions

2010-08-02 20:29:56 -07:00

Kconfig

input: Add keyreset driver.

2010-09-29 17:49:12 -07:00

keyreset.c

input: Add keyreset driver.

2010-09-29 17:49:12 -07:00

Makefile

input: Add keyreset driver.

2010-09-29 17:49:12 -07:00

mousedev.c

Input: mousedev - fix regression of inverting axes

2010-08-25 07:50:44 -07:00

sparse-keymap.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2010-04-15 11:49:55 -07:00

xen-kbdfront.c

x86: early PV on HVM features initialization.

2010-07-22 16:45:35 -07:00