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-03-30 16:45:39 -07:00
2012-04-02 14:41:27 -07:00
2012-03-29 19:52:47 +08:00
2012-04-12 17:42:01 +01:00
2012-05-14 15:33:42 +02:00
2012-04-09 15:54:48 -04:00
2012-04-15 11:08:53 -07:00
2012-04-10 14:53:55 +02:00
2012-04-04 10:04:42 -07:00
2012-04-04 17:13:43 -07:00