Merge master.kernel.org:/home/rmk/linux-2.6-arm

author Linus Torvalds <torvalds@g5.osdl.org>

Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
diff --cc arch/arm/mach-ixp2000/enp2611.c
Simple merge
diff --cc arch/arm/mach-ixp2000/ixdp2x00.c
Simple merge
diff --cc arch/arm/mach-ixp2000/ixdp2x01.c
Simple merge
diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge
diff --cc arch/arm/mach-s3c2410/mach-rx3715.c
Simple merge
diff --cc drivers/i2c/busses/i2c-iop3xx.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
		1	2
arch/arm/mach-ixp2000/enp2611.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp2000/ixdp2x00.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp2000/ixdp2x01.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lubbock.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2410/mach-rx3715.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-iop3xx.c	patch \|	diff1 \|	diff2 \|	blob \| history