Linus Torvalds a9a0aff5b5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits) m68k: amiga - RTC platform device conversion m68k: amiga - Parallel port platform device conversion m68k: amiga - Serial port platform device conversion m68k: amiga - Mouse platform device conversion m68k: amiga - Keyboard platform device conversion m68k: amiga - Amiga Gayle IDE platform device conversion m68k: amiga - A4000T SCSI platform device conversion m68k/scsi: a3000 - Do not use legacy Scsi_Host.base m68k: amiga - A3000 SCSI platform device conversion m68k/scsi: gvp11 - Do not use legacy Scsi_Host.base m68k: amiga - GVP Series II SCSI zorro_driver conversion m68k/scsi: a2091 - Do not use legacy Scsi_Host.base m68k: amiga - A2091/A590 SCSI zorro_driver conversion m68k/scsi: mvme147 - Kill obsolete HOSTS_C logic m68k/scsi: a3000 - Kill a3000_scsiregs typedef m68k/scsi: gvp11 - Kill gvp11_scsiregs typedef m68k/scsi: a2091 - Kill a2091_scsiregs typedef m68k/scsi: gvp11 - Extract check_wd33c93() m68k/scsi: a3000 - Kill static global a3000_host m68k/scsi: mvme147 - Kill static global mvme147_host ...		2010-05-27 10:19:19 -07: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	m68k: amiga - Keyboard platform device conversion	2010-05-26 19:51:09 +02:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-27 09:19:55 -07:00
mouse	m68k: amiga - Mouse platform device conversion	2010-05-26 19:51:09 +02: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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-27 09:19:55 -07:00
apm-power.c	Input: apm-power - fix crash when unloading modules	2008-03-24 11:02:06 -04:00
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: use ABS_CNT rather than (ABS_MAX + 1)	2010-05-20 23:05: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