黄涛 2f206fddfe Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 ...

Conflicts:
	drivers/input/touchscreen/Makefile
	drivers/media/video/rk29_camera.c
	sound/soc/codecs/wm8994.c

2011-08-09 10:06:42 +08:00

..

gameport

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

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

gsensor

mma8452: fix for v2.6.36

2011-08-01 11:22:01 +08:00

jogball

jogball

2010-09-13 02:07:35 -07:00

joystick

Input: fix faulty XXinput_* calls

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

keyboard

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

lightsensor

xxm FIH: 1.update cm3202 ,2.update rk29_serial for gps

2011-05-19 10:30:33 +08:00

magnetometer

compass ak8975: add suspend and resume return value

2011-08-03 01:21:41 -07:00

misc

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

2011-08-09 10:06:42 +08:00

mouse

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

serio

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

tablet

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

touchscreen

Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

2011-08-09 10:06:42 +08: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

Revert "Input: Hold wake lock while event queue is not empty."

2011-07-30 22:57:54 +08: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

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

joydev.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

Kconfig

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08:00

keyreset.c

Revert "input: Add keyreset driver."

2011-07-30 22:55:10 +08:00

Makefile

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

2011-08-01 00:04:45 +08: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

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00