+95
−0
+1628
−0
File added.
Preview size limit exceeded, changes collapsed.
+918
−0
File added.
Preview size limit exceeded, changes collapsed.
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
arch/arm/mach-spear3xx/Makefile
arch/arm/mach-spear3xx/clock.c
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear6xx/clock.c
arch/arm/plat-spear/Makefile
drivers/pinctrl/core.c
This resolves some annoying merge conflicts.
Signed-off-by:
Arnd Bergmann <arnd@arndb.de>
File added.
Preview size limit exceeded, changes collapsed.
File added.
Preview size limit exceeded, changes collapsed.