Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 45c8fa87 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635-4/spi-devs 

Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/include/mach/map.h
	arch/arm/mach-s5pv210/Makefile
parents 84eb9ecc ef2f07d3
Hide 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