]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:59:26 +0000 (13:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:59:29 +0000 (13:59 +1000)
commitda7185371982bb0b1667bae2c0dab76d36adda0d
treebdbb6cacf2aaddf2924a74dad1be53f607301ecc
parentd232c030b635280fbc13e4890a754abb6fa05005
parent08cf78ed41feaa21017487bad0a5a405c6cede43
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
arch/arm/mach-vexpress/platsmp.c
arch/arm/mach-exynos/exynos.c
arch/mips/cavium-octeon/setup.c
arch/powerpc/kernel/epapr_paravirt.c
arch/powerpc/kernel/fadump.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/platforms/pseries/setup.c
drivers/of/address.c
drivers/of/base.c
drivers/of/platform.c
include/linux/of_address.h