forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/drivers/input
History
黄涛 d120da9fa2 Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 
Conflicts:
	arch/arm/mm/mmu.c
	drivers/input/keyboard/Makefile
	drivers/media/video/gc0309.c
	drivers/misc/Kconfig
	drivers/mmc/core/core.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/usb/gadget/f_mass_storage.c
	drivers/video/backlight/Makefile
	include/linux/fb.h
	include/linux/mmc/host.h
2011-09-26 14:53:47 +08:00
..
gameport Merge commit 'v2.6.34-rc6' into core/locking 2010-05-03 09:17:01 +02:00
gsensor Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
gyroscope gsensor,gyroscope: add gsensor lis3dh and gyroscope k3g drivers 2011-09-01 01:32:29 -07: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 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
lightsensor xxm FIH: 1.update cm3202 ,2.update rk29_serial for gps 2011-05-19 10:30:33 +08:00
magnetometer gsensor驱动和指南针驱动修改 2011-08-15 17:52:51 +08:00
misc Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-08-23 14:51:45 +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-09-26 14:53:47 +08:00
apm-power.c
evbug.c
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
input-compat.c
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 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +08:00
keyreset.c Revert "input: Add keyreset driver." 2011-07-30 22:55:10 +08:00
Makefile Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36 2011-09-26 14:53:47 +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