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
..
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	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
hil_mlc.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
hp_sdc_mlc.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
hp_sdc.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01: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
i8042-jazzio.h
i8042-ppcio.h
i8042-snirm.h
i8042-sparcio.h	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
i8042-x86ia64io.h	Input: i8042 - add a PNP entry to the aux device list	2010-05-19 10:14:04 -07:00
i8042.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
i8042.h
Kconfig	input: serio: add support for Amstrad Delta serial keyboardport	2010-05-05 11:11:10 -07: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
Makefile	input: serio: add support for Amstrad Delta serial keyboardport	2010-05-05 11:11:10 -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
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	Input: serio_raw - remove BKL	2010-03-09 22:05:48 -08:00
serio.c	Merge commit 'v2.6.33-rc5' into next	2010-01-21 23:55:25 -08:00
serport.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
xilinx_ps2.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00