Commit b61dd8a7 authored by Kevin Hilman's avatar Kevin Hilman

Merge branch 'davinci-next'

Conflicts:
	arch/arm/configs/davinci_all_defconfig
	arch/arm/mach-davinci/board-dm365-evm.c
parents a3ecea37 1a7ff8ff
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment