Skip to content
Commit 4c5f830c authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD 

Conflicts:
	arch/arm/plat-omap/include/plat/common.h
parents cc511b8d 2e3d256d
Expand all 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