Merge branch 'davinci-next'
Conflicts: arch/arm/configs/davinci_all_defconfig arch/arm/mach-davinci/board-dm365-evm.c
Showing
This diff is collapsed.
Please register or sign in to comment
Conflicts: arch/arm/configs/davinci_all_defconfig arch/arm/mach-davinci/board-dm365-evm.c