Conflicts:

	arch/arm/Kconfig
	arch/arm/mach-davinci/board-evm.c
	arch/arm/mach-davinci/serial.c
	drivers/i2c/busses/i2c-davinci.c
	drivers/media/video/Makefile
	include/asm-arm/arch-davinci/entry-macro.S
	include/asm-arm/arch-davinci/gpio.h
	include/asm-arm/arch-davinci/serial.h
	include/asm-arm/arch-davinci/system.h
	include/asm-arm/memory.h