Skip to content
Commit 0ae9a22b authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-s5pv210' into for-next-new 

Conflicts:
	arch/arm/mach-s5pv210/mach-smdkv210.c
parents 5ed76f3d 8f49720d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment