Skip to content
Commit b8bc8397 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'pxa/devel' into next/devel2 

Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c
parents 11f0d931 bca7ab31
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