Skip to content
Commit 56c035c9 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'next-s3c64xx-device' into next-merged 

Conflicts:

	arch/arm/mach-s3c2440/mach-at2440evb.c
parents 7f275437 438a5d42
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