Arnd Bergmann
d2819f80d4
Merge branch 'spear/pinctrl' into spear/clock
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>
2012-05-14 15:33:42 +02:00
..
2012-05-14 15:33:42 +02:00
2012-04-22 22:49:28 +02:00
2012-05-14 15:33:42 +02:00
2012-04-22 22:41:35 +02:00
2012-05-14 15:33:42 +02:00
2012-04-22 22:49:26 +02:00
2012-04-22 22:49:26 +02:00
2012-05-14 15:33:42 +02:00