Merge of OMAP tree 2.6.23-rc2
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-davinci/Kconfig
arch/arm/mach-davinci/Makefile
arch/arm/mach-davinci/board-evm.c
arch/arm/mach-davinci/clock.c
arch/arm/mach-davinci/clock.h
arch/arm/mach-davinci/gpio.c
arch/arm/mach-davinci/id.c
arch/arm/mach-davinci/io.c
arch/arm/mach-davinci/irq.c
arch/arm/mach-davinci/serial.c
arch/arm/mach-davinci/time.c
arch/arm/mm/Kconfig
drivers/i2c/busses/Kconfig
drivers/i2c/chips/Kconfig
drivers/ide/ide-proc.c
drivers/net/Kconfig
drivers/rtc/Makefile
drivers/usb/musb/plat_uds.c
include/asm-arm/arch-davinci/common.h
include/asm-arm/arch-davinci/debug-macro.S
include/asm-arm/arch-davinci/dma.h
include/asm-arm/arch-davinci/entry-macro.S
include/asm-arm/arch-davinci/gpio.h
include/asm-arm/arch-davinci/hardware.h
include/asm-arm/arch-davinci/io.h
include/asm-arm/arch-davinci/irqs.h
include/asm-arm/arch-davinci/memory.h
include/asm-arm/arch-davinci/system.h
include/asm-arm/arch-davinci/timex.h
include/asm-arm/arch-davinci/uncompress.h
include/asm-arm/arch-davinci/vmalloc.h
