Merge branch 'spear/pinctrl' into spear/clock
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 13:33:42 +0000 (15:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 13:33:42 +0000 (15:33 +0200)
commitd2819f80d465672b09c2f4cb52303b7f951c4d0f
treeaa0262703e86b97ad1460c722e78d7233e24e3bb
parent5df33a62c4a028d6fc7f2dcc159827d09b7334b8
parent366695ff706669d40459174b1cbb78fca42f4e06
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>
MAINTAINERS
arch/arm/mach-spear3xx/Makefile
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear3xx/include/mach/spear.h
arch/arm/mach-spear3xx/spear320.c
arch/arm/mach-spear3xx/spear3xx.c
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/plat-spear/Makefile