Jiri Kosina 59f91e5dd0 Merge branch 'master' into for-next ... Conflicts: include/linux/mmzone.h Synced with Linus' tree so that trivial patch can be applied on top of up-to-date code properly. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>		2012-06-29 14:45:58 +02:00
..
gameport
joystick	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-05-24 10:34:29 -07:00
keyboard	lm8333: Fix check ordering	2012-06-27 17:35:55 +02:00
misc	Merge branch 'master' into for-next	2012-06-29 14:45:58 +02:00
mouse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-05-24 10:34:29 -07:00
serio
tablet	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-05-24 10:34:29 -07:00
touchscreen	MFD changes for 3.5	2012-05-29 11:53:11 -07:00
apm-power.c
evbug.c
evdev.c
ff-core.c
ff-memless.c	[media] Input: move drivers/input/fixp-arith.h to include/linux	2012-05-14 09:47:23 -03:00
input-compat.c
input-compat.h
input-mt.c
input-polldev.c
input.c
joydev.c
Kconfig	Input: matrix-keymap - uninline and prepare for device tree support	2012-05-10 22:38:47 -07:00
Makefile	Input: matrix-keymap - uninline and prepare for device tree support	2012-05-10 22:38:47 -07:00
matrix-keymap.c	Input: matrix-keymap - fix building keymaps	2012-05-24 01:12:20 -07:00
mousedev.c
sparse-keymap.c