Skip to content
GitLab
Commit dca3a783 authored by Jon Hunter's avatar Jon Hunter
Browse files

Merge commit '31d9adca' into tmp 

Conflicts:
	arch/arm/plat-omap/dmtimer.c
parents 71856843 31d9adca
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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