]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:58:22 +0000 (14:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 04:58:22 +0000 (14:58 +1000)
commit0001911cfabd9eb90746b6171193d76e53af29f4
treebfbabd98429fe20879f7efb61f9a2c081a785dd2
parent358266073922db0f50cb33274128a5d9f172014e
parenta2166ca5f3204794e8b59f01c93a0f1564e3e138
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt
Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
MAINTAINERS
drivers/gpu/drm/rcar-du/rcar_du_kms.c
drivers/media/platform/am437x/am437x-vpfe.c
drivers/media/platform/soc_camera/soc_camera.c
drivers/of/base.c
include/linux/of.h