Kevin Hilman 7940a34b2e Merge branch 'davinci-next' into davinci-for-linus ... Conflicts: arch/arm/mach-davinci/board-da830-evm.c arch/arm/mach-davinci/board-da850-evm.c		2010-10-21 11:21:55 -07:00
..
mach	Merge branch 'davinci-next' into davinci-for-linus	2010-10-21 11:21:55 -07:00