Olof Johansson d5a2a1ba83 Linux 3.4-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPpvY9AAoJEHm+PkMAQRiGpEoIAJgbu+Y8gITnBK/wh9O6zy3S 5jie5KK4YWdbJsvO58WbNr3CyVIwGIqQ2dUZLiU59aBVLarlGw8xor0MmW+cZwhp 6fBHaf0qDYAV0MZjD+mnnExOiCRyISa2lPmsfu9dAWywh5KGe6/oAP6/qcXIyok3 KZyl3qQf4ENpaZPHwZPXCEkUvtuyHgNiszN+QXEadA3s19Ot4VGe9A3VGw+GNrSm JqFIq3acQAbKa5BYaqf7TQC02v2FI7//eqt6QHxTqbE6a7LGbTvLfX3HlJ2mnfqa 1R6QHhM4y4OZDHbaMT2raHZ8WuLXzhehJzhP8Co7AHFOKwVKOb5XbcUr2RrukMU= =HkMd -----END PGP SIGNATURE----- Merge tag 'v3.4-rc6' into next/cleanup Linux 3.4-rc6 Resolve conflict where an u5500 file had a bugfix go in, but was deleted in the branch staged for next merge window. Signed-off-by: Olof Johansson <olof@lixom.net>		2012-05-09 02:31:01 -07:00
..
gameport	Driver core: driver_find() drops reference before returning	2012-01-24 16:00:34 -08:00
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	mfd: Convert twl6040 to i2c driver, and separate it from twl core	2012-04-16 16:45:34 +02: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	Input: Kconfig: remove dependency for atmel_tsadcc driver	2012-04-16 12:47:18 +02:00
apm-power.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
evbug.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
evdev.c	Merge branch 'next' into for-linus	2012-03-19 17:02:01 -07:00
ff-core.c	Input: force feedback - potential integer wrap in input_ff_create()	2011-10-12 21:13:11 -07:00
ff-memless.c	Input: use pr_fmt and pr_<level>	2010-11-30 23:10:26 -08:00
fixp-arith.h
input-compat.c	compat: Use COMPAT_USE_64BIT_TIME in the input subsystem	2012-02-20 12:48:47 -08:00
input-compat.h	compat: Use COMPAT_USE_64BIT_TIME in the input subsystem	2012-02-20 12:48:47 -08:00
input-mt.c	drivers/input: add export.h to symbol exporting files.	2011-10-31 19:31:16 -04:00
input-polldev.c	Merge commit 'v3.2-rc3' into next	2011-11-29 01:51:07 -08:00
input.c	Input: Use accessor for MT values	2012-02-02 14:42:20 +01:00
joydev.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
Kconfig	Input: of_keymap - add device tree bindings for simple key matrices	2012-03-13 21:37:04 -07:00
Makefile	Input: of_keymap - add device tree bindings for simple key matrices	2012-03-13 21:37:04 -07:00
mousedev.c	Input: properly assign return value of clamp() macro.	2011-05-25 09:24:58 -07:00
of_keymap.c	Input: of_keymap - add device tree bindings for simple key matrices	2012-03-13 21:37:04 -07:00
sparse-keymap.c	drivers/input: Add module.h to modular drivers implicitly using it	2011-10-31 19:31:16 -04:00