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
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
evdev.c	Input: evdev - rearrange ioctl handling	2010-08-02 20:30:44 -07:00
ff-core.c
ff-memless.c
fixp-arith.h
input-compat.c
input-compat.h
input-polldev.c
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
Makefile
mousedev.c	Input: switch to input_abs_*() access functions	2010-08-02 20:29:56 -07:00
sparse-keymap.c
xen-kbdfront.c	x86: early PV on HVM features initialization.	2010-07-22 16:45:35 -07:00