Skip to content
Commit 33b9f582 authored by Russell King's avatar Russell King
Browse files

Merge branch 'cleanup' into for-linus 

Conflicts:
	arch/arm/plat-omap/dmtimer.c
parents 946342d0 008ca431
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