Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)]
1  2 
arch/arm/mach-ixp2000/enp2611.c
arch/arm/mach-ixp2000/ixdp2x00.c
arch/arm/mach-ixp2000/ixdp2x01.c
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-s3c2410/mach-rx3715.c
drivers/i2c/busses/i2c-iop3xx.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge