Skip to content
Commit 6e03a615 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'ep93xx' into for-2.6.36 

Trivial add/add fixup required in the clock table.

Conflicts:
	arch/arm/mach-ep93xx/clock.c
parents 9eb34302 ed67ea82
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