Dmitry Torokhov 95d465fd75 Manual merge with Linus. ...

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

2006-04-02 00:08:05 -05:00

..

ambakmi.c

…

ct82c710.c

…

gscps2.c

[PARISC] I/O-Space must be ioremap_nocache()'d

2006-03-30 17:48:42 +00:00

hil_mlc.c

Manual merge with Linus.

2006-04-02 00:08:05 -05:00

hp_sdc_mlc.c

BUG_ON() Conversion in input/serio/hp_sdc_mlc.c

2006-03-26 18:23:47 +02:00

hp_sdc.c

…

i8042-io.h

…

i8042-ip22io.h

…

i8042-jazzio.h

…

i8042-ppcio.h

…

i8042-sparcio.h

…

i8042-x86ia64io.h

Input: i8042 - fix logic around pnp_register_driver()

2006-03-14 00:12:24 -05:00

i8042.c

…

i8042.h

…

Kconfig

…

libps2.c

Input: serio - semaphore to mutex conversion

2006-02-19 00:21:55 -05:00

maceps2.c

…

Makefile

Input: kill remnants of 98kbd{,-io} and 98spkr

2006-02-15 00:49:48 -05:00

parkbd.c

Input: use kzalloc() throughout the code

2006-03-14 00:09:16 -05:00

pcips2.c

…

q40kbd.c

…

rpckbd.c

Input: use kzalloc() throughout the code

2006-03-14 00:09:16 -05:00

sa1111ps2.c

…

serio_raw.c

Input: use kzalloc() throughout the code

2006-03-14 00:09:16 -05:00

serio.c

Input: serio - fix memory leak

2006-03-14 00:13:29 -05:00

serport.c

…