Commit 3034b008 authored Mar 16, 2015 by Arnd Bergmann

Merge tag 'v4.0-rockchip-armfixes1' of...

Merge tag 'v4.0-rockchip-armfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Pull "ARM: rockchip: small fixes for 4.0-rc" from Heiko Stuebner:

Adding a default-disabled state to the new gmac node and an
update to the MAINTAINERS entry adding a rockchip regexp entry.

* tag 'v4.0-rockchip-armfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: disable gmac by default in rk3288.dtsi
  MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry

parents 06e5801b 54b0bc60

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1362,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c
		F: drivers//rockchip*
		F: drivers///rockchip
		F: sound/soc/rockchip/
		N: rockchip

		ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
		M: Kukjin Kim <kgene@kernel.org>

arch/arm/boot/dts/rk3288.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -411,6 +411,7 @@
		"mac_clk_rx", "mac_clk_tx",
		"clk_mac_ref", "clk_mac_refout",
		"aclk_mac", "pclk_mac";
		status = "disabled";
		};

		usb_host0_ehci: usb@ff500000 {