davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e4862f2f6f
kernel-ark/drivers/input
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01: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: fix faulty XXinput_* calls 2010-08-13 12:03:24 -07:00
misc Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
mouse param: use ops in struct kernel_param, rather than get and set fns directly 2010-08-11 23:04:13 +09:30
serio Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
tablet Merge branch 'next' into for-linus 2010-08-10 08:41:58 -07:00
touchscreen touchscreen: Fix sign bug 2010-08-12 11:27:59 +02:00
apm-power.c
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 - rearrange ioctl handling 2010-08-02 20:30:44 -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
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: dynamically allocate ABS information 2010-08-02 20:30:04 -07:00
joydev.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
Kconfig Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 2009-12-10 09:34:40 -08:00
Makefile Input: add generic support for sparse keymaps 2009-12-07 09:26:35 -08:00
mousedev.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -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