Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ...

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

2008-10-15 11:31:54 +11:00

..

gameport

Input: remove CVS keywords

2008-05-20 12:17:39 -04:00

joystick

Input: xpad - add Pelican Eclipse D-Pad to the list of devices

2008-07-31 00:45:59 -04:00

keyboard

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

2008-10-07 19:08:56 +01:00

misc

HP input: kill warnings due to suseconds_t differences

2008-10-14 10:23:27 -07:00

mouse

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2008-09-22 07:46:06 -07:00

serio

Merge commit 'origin'

2008-10-15 11:31:54 +11:00

tablet

Input: remove version.h from drivers that don't need it

2008-08-18 11:00:47 -04:00

touchscreen

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

apm-power.c

Input: apm-power - fix crash when unloading modules

2008-03-24 11:02:06 -04:00

evbug.c

Input: evbug - identify device by its sysfs ID

2008-06-30 09:36:17 -04:00

evdev.c

Input: evdev - fix printf() format for sizeof

2008-08-19 11:35:27 -04:00

ff-core.c

drivers/input/ff-core.c needs <linux/sched.h>

2008-07-02 18:40:08 -07:00

ff-memless.c

Input: use clamp_val() macro in ff-memless.c

2008-05-16 14:49:47 -04:00

fixp-arith.h

changed email

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

input-polldev.c

Input: remove private member from input_dev structure

2008-04-02 00:41:00 -04:00

input.c

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

2008-07-21 00:55:14 -04:00

joydev.c

Input: make sure input interfaces pin parent input devices

2008-04-01 00:22:53 -04:00

Kconfig

xen pvfb: Para-virtual framebuffer, keyboard and pointer driver

2008-04-24 23:57:33 +02:00

Makefile

xen pvfb: Para-virtual framebuffer, keyboard and pointer driver

2008-04-24 23:57:33 +02:00

mousedev.c

mousedev: BKL pushdown

2008-07-02 15:06:23 -06:00

xen-kbdfront.c

xen: clean up domain mode predicates

2008-08-20 12:40:07 +02:00