Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
gameport	Merge commit 'v2.6.34-rc6' into core/locking	2010-05-03 09:17:01 +02:00
joystick	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
keyboard	Input: do not force selecting i8042 on Moorestown	2010-05-19 10:14:25 -07:00
misc	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
mouse	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
serio	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
tablet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
touchscreen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
apm-power.c
evbug.c	Input: struct device - replace bus_id with dev_name(), dev_set_name()	2008-10-30 09:29:05 -04:00
evdev.c	Input: scancode in get/set_keycodes should be unsigned	2010-03-08 23:19:15 -08:00
ff-core.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ff-memless.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
fixp-arith.h
input-compat.c	Input: refactor evdev 32bit compat to be shareable with uinput	2008-10-27 22:03:42 -04:00
input-compat.h	[IA64] Remove COMPAT_IA32 support	2010-02-08 10:42:17 -08:00
input-polldev.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
input.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-04-15 11:49:55 -07:00
joydev.c	Input: joydev - allow binding to button-only devices	2010-05-03 23:51:28 -07:00
Kconfig	Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2009-12-10 09:34:40 -08:00
Makefile	Input: add generic support for sparse keymaps	2009-12-07 09:26:35 -08:00
mousedev.c	Input: mousedev - remove BKL	2010-03-09 22:05:09 -08:00
sparse-keymap.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-04-15 11:49:55 -07:00
xen-kbdfront.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00