Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ...

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

2010-12-22 18:57:02 +01:00

..

altera_ps2.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

ambakmi.c

Input: ambakmi - annotate probe() and remove() methods

2009-12-11 23:45:57 -08:00

ams_delta_serio.c

input: serio: add support for Amstrad Delta serial keyboardport

2010-05-05 11:11:10 -07:00

at32psif.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

ct82c710.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

gscps2.c

parisc: Fix GSC PS/2 driver name for keyboard and mouse

2010-12-04 11:19:59 -05:00

hil_mlc.c

input: Serio/hil_mlc: semaphore cleanup

2010-10-12 17:36:08 +02:00

hp_sdc_mlc.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

hp_sdc.c

input: Serio/hp_sdc: semaphore cleanup

2010-10-12 17:36:08 +02:00

i8042-io.h

powerpc: Add i8042 keyboard and mouse irq parsing

2010-07-09 11:28:33 +10:00

i8042-ip22io.h

Input: make i8042_platform_init return 'real' error code

2005-09-04 01:41:38 -05:00

i8042-jazzio.h

Input: make i8042_platform_init return 'real' error code

2005-09-04 01:41:38 -05:00

i8042-ppcio.h

Input: i8042 - remove SPRUCE support

2010-06-04 00:44:30 -07:00

i8042-snirm.h

Input: i8042 - add SNI RM support

2008-03-14 11:54:06 -04:00

i8042-sparcio.h

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00

i8042-x86ia64io.h

Input: i8042 - add Sony VAIOs to MUX blacklist

2010-11-04 08:39:11 -07:00

i8042.c

Merge branch 'for-linus' into next

2010-10-17 21:20:19 -07:00

i8042.h

Input: i8042 - add SNI RM support

2008-03-14 11:54:06 -04:00

Kconfig

Kconfig: typo: boad -> board

2010-11-02 22:47:50 -04:00

libps2.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

maceps2.c

define global BIT macro

2007-10-19 11:53:42 -07:00

Makefile

Input: serio - add support for PS2Mult multiplexer protocol

2010-10-18 09:33:31 -07:00

parkbd.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

pcips2.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

ps2mult.c

Input: serio - add support for PS2Mult multiplexer protocol

2010-10-18 09:33:31 -07:00

q40kbd.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

rpckbd.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

sa1111ps2.c

Input: sa1111ps2 - annotate probe() and remove() methods

2009-12-11 23:46:05 -08:00

serio_raw.c

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

serio.c

Input: serio - support multiple child devices per single parent

2010-10-13 07:49:28 -07:00

serport.c

serport: place serport serio device correctly in the device tree

2010-10-22 10:19:58 -07:00

xilinx_ps2.c

of/device: Replace struct of_device with struct platform_device

2010-08-06 09:25:50 -06:00