Skip to content
Commit 12d7d4e0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'devel-cleanup' into omap-for-linus 

Conflicts:
	arch/arm/mach-omap2/timer-gp.c
parents aca6ad07 790ab7e9
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