Skip to content
Commit 7940a34b authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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
parents 6451d778 8939b350
Hide whitespace changes
Inline Side-by-side
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