Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-07 09:03:39 -07:00

..

gameport

Driver core: driver_find() drops reference before returning

2012-01-24 16:00:34 -08:00

joystick

USB: input: xpad.c: fix up dev_* messages

2012-05-04 15:32:53 -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

USB: input: yealink.c: fix up dev_* messages

2012-05-04 15:33:01 -07:00

mouse

Merge 3.4-rc6 into usb-next

2012-05-07 09:03:39 -07:00

serio

Merge branch 'fixes-gpio-to-irq' into fixes

2012-03-29 10:16:04 -07:00

tablet

USB: input: wacom_sys.c: fix up dev_* messages

2012-05-04 15:33:13 -07:00

touchscreen

USB: input: usbtouchscreen.c: fix up dev_* messages

2012-05-04 15:33:16 -07: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

changed email

2007-10-20 00:47:32 +02:00

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