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

..

ambakmi.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

at32psif.c

Input: at32psif - update MODULE_AUTHOR with new email

2008-04-24 13:25:18 -04:00

ct82c710.c

Input: remove CVS keywords

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

gscps2.c

drivers/input/: Spelling fixes

2008-02-03 17:15:20 +02:00

hil_mlc.c

Input: hil_mlc.c - make code static

2008-06-30 09:38:26 -04:00

hp_sdc_mlc.c

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

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

hp_sdc.c

HP input: kill warnings due to suseconds_t differences

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

i8042-io.h

powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks

2008-09-23 10:41:28 -05: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

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

i8042-snirm.h

Input: i8042 - add SNI RM support

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

i8042-sparcio.h

sparc: Annotate of_device_id arrays with const or __initdata.

2008-08-31 01:23:17 -07:00

i8042-x86ia64io.h

Input: i8042 - make Lenovo 3000 N100 blacklist entry more specific

2008-09-04 22:57:35 -04:00

i8042.c

Input: i8042 - retry failed CTR writes when resuming

2008-06-17 11:47:27 -04:00

i8042.h

Input: i8042 - add SNI RM support

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

Kconfig

Input: add new serio driver for Xilinx XPS PS2 IP

2008-07-07 16:19:56 -04:00

libps2.c

Input: libps2 - remove delayed command execution

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

maceps2.c

define global BIT macro

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

Makefile

Input: add new serio driver for Xilinx XPS PS2 IP

2008-07-07 16:19:56 -04:00

parkbd.c

[PARPORT] Remove unused 'irq' argument from parport irq functions

2007-10-23 19:53:16 -04:00

pcips2.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

q40kbd.c

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

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

rpckbd.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1111ps2.c

some kmalloc/memset ->kzalloc (tree wide)

2007-07-19 10:04:50 -07:00

serio_raw.c

serio: BKL pushdown

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

serio.c

Input: serio - offload resume to kseriod

2008-07-23 14:02:04 -04:00

serport.c

tty: Ldisc revamp

2008-07-20 17:12:34 -07:00

xilinx_ps2.c

Input: xilinx_ps2 - fix warning

2008-08-10 23:13:15 -04:00