Depends:

 - Based on v3.6-rc5
 - kirkwood/addr_decode

New drivers:
 - pinctrl (dove, kirkwood, mvebu)
 - gpio (mvebu)

Conflicts:
 - kirkwood/boards (arch/arm/Kconfig)
    - keep MIGHT_HAVE_PCI
    - keep PLAT_ORION_LEGACY over PLAT_ORION
    - allow add USB_ARCH_HAS_EHCI

Resolution should look like this:

config ARCH_DOVE
	bool "Marvell Dove"
	select CPU_V7
	select ARCH_REQUIRE_GPIOLIB
	select GENERIC_CLOCKEVENTS
	select MIGHT_HAVE_PCI
	select NEED_MACH_IO_H
	select PLAT_ORION_LEGACY
	select USB_ARCH_HAS_EHCI
	help
	  Support for the Marvell Dove SoC 88AP510
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)

iQEcBAABAgAGBQJQXeu/AAoJEAi3KVZQDZAeiFQH/AsmAHqs7qNzM3ftsoefZftO
L1Li4P/qiUXS24/EK63B5odozD++egQNCW2e9oA6u9awlXgCigTVzm2rlixmUsDj
ht6g6ocTJOmd+ZHfJovyBn8F5sm+UB7paYbM9ivLXtERof6jph4A777/komb33j+
O0aeLJLPSOK9ISmBlFcgVLgzrvhMRH8JfflD1SO4BAA8LOK0KnNcvET4qqHaCNJD
1VBaM9ljmNQb04e1ll/RwFXr7yk55DMrhgSMYcf80ADwmTk/8pxzRQRavGLq8LJR
EGt8+rm3LFN4zEKTr/62KfjNChIqSgpPm+nF4Dw+mlhpA+1s8HAOSwTTsufKIvo=
=Fpxp
-----END PGP SIGNATURE-----