Commit f18ea827 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

	arch/arm/mach-s3c2440/mach-anubis.c
parents 3d4db84c 1a71e4ad
Supports Markdown
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