Colin Cross f02fac6330 Merge commit 'v3.4-rc6' into android-3.4 ... Conflicts: arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91		2012-05-07 18:20:34 -07:00
..
gameport
joystick	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-03-29 23:17:44 -07:00
keyboard	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-03-29 23:17:44 -07:00
misc	Merge commit 'v3.4-rc4' into android-3.4	2012-04-27 14:03:45 -07:00
mouse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-04-30 10:13:48 -07:00
serio	Merge branch 'fixes-gpio-to-irq' into fixes	2012-03-29 10:16:04 -07:00
tablet	Input: wacom - check for allocation failure in probe()	2012-03-29 22:42:19 -07:00
touchscreen	Merge commit 'v3.4-rc3' into android-3.4	2012-04-19 14:42:22 -07:00
apm-power.c
evbug.c
evdev.c	Input: evdev - Add ioctl to block suspend while event queue is not empty.	2012-04-09 13:53:13 -07:00
ff-core.c
ff-memless.c
fixp-arith.h
input-compat.c
input-compat.h
input-mt.c
input-polldev.c
input.c
joydev.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
Kconfig	input: Add keyreset driver.	2012-04-09 13:53:16 -07:00
keyreset.c	input: Add keyreset driver.	2012-04-09 13:53:16 -07:00
Makefile	input: Add keyreset driver.	2012-04-09 13:53:16 -07:00
mousedev.c
of_keymap.c
sparse-keymap.c