Skip to content
Commit 15893fb5 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/sdhi-mfd' 

Conflicts:
	arch/sh/boards/mach-ecovec24/setup.c
	arch/sh/boards/mach-kfr2r09/setup.c
parents f32154c9 96987d96
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment