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

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