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-04-15 17:35:19 -07:00
2012-04-16 16:45:34 +02:00
2012-04-16 21:27:07 +02:00
2012-04-20 20:30:19 -04:00
2012-04-09 16:29:34 +02:00
2012-04-16 15:19:12 -04:00
2012-05-10 13:22:01 +02:00
2012-04-02 14:41:25 -07:00
2012-04-04 10:09:30 -07:00
2012-04-16 08:35:33 -07:00
2012-05-08 14:13:25 -07:00
2012-05-08 14:13:25 -07:00
2012-05-11 17:13:00 +02:00
2012-05-02 09:30:32 +01:00
2012-04-04 17:13:43 -07:00
2012-04-10 15:30:16 -07:00
2012-04-06 02:43:12 -04:00
2012-04-02 14:41:27 -07:00
2012-04-05 15:30:34 -07:00
2012-04-12 12:57:08 +02:00
2012-04-10 22:39:17 -06:00
2012-04-12 00:37:48 -06:00
2012-04-02 09:50:40 -07:00
2012-04-12 18:35:58 -07:00
2012-04-11 22:55:25 -03:00
2012-04-03 09:49:59 -07:00
2012-04-21 01:58:20 -04:00
2012-04-03 17:23:23 -04:00
2012-05-02 01:14:40 +02:00
2012-04-09 10:38:30 -07:00
2012-04-11 10:11:12 -04:00
2012-04-05 19:04:27 -04:00
2012-04-14 07:47:49 -07:00
2012-04-05 15:25:51 -07:00
2012-04-10 22:39:17 -06:00
2012-04-11 09:36:00 +01:00