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

This is an archived project. Repository and other project resources are read-only.

Commit a93d6201 authored Nov 20, 2012 by Olof Johansson

Merge branch 'clps711x/soc' into clps711x/soc2



Conflicts:
	arch/arm/Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 2cad6a8a 2a552891

Hide whitespace changes

Inline Side-by-side

Please register or to comment