Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:32:14 +0000 (21:32 -0800)
commit7f36b1e9582c06d0ddef5f2416c9b17017647d1f
treef83cbcef623476b9b8a14f7a0cc66eb92552a651
parent0e016b9fa134d79341cca5e336ccbcea066d5f81
parent73ee723e4c6d179c2e9496cc4caf160a18d95603
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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