Merge branch 'fixes' into for-next

* fixes:
  MAINTAINERS: Add maintainers entry for Rockchip SoCs
  MAINTAINERS: Tegra updates, and driver ownership
  MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
  ARM: integrator: deactivate timer0 on the Integrator/CP
  ARM: exynos: dts: Update 5250 arch timer node with clock frequency

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index d4dc915f3ef55437d4635f5d146aad0a8fd6d3f9,571246222ea4e88f13a11a15dc749a25c44968db..3040e43179f8adfdee24c105f31cf16a14360795
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1148,6 -1150,18 +1150,13 @@@ F:    drivers/net/ethernet/i825xx/ether1
  F:    drivers/net/ethernet/seeq/ether3*
  F:    drivers/scsi/arm/
  
 -ARM/SHARK MACHINE SUPPORT
 -M:    Alexander Schulz <alex@shark-linux.de>
 -W:    http://www.shark-linux.de/shark.html
 -S:    Maintained
 -
+ ARM/Rockchip SoC support
+ M:    Heiko Stuebner <heiko@sntech.de>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-rockchip/
+ F:    drivers/*/*rockchip*
+ 
  ARM/SAMSUNG ARM ARCHITECTURES
  M:    Ben Dooks <ben-linux@fluff.org>
  M:    Kukjin Kim <kgene.kim@samsung.com>

diff --cc arch/arm/boot/dts/integratorcp.dts
Simple merge