]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'devicetree/next-overlay' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:06:23 +0000 (14:06 +0100)
committerGrant Likely <grant.likely@linaro.org>
Mon, 11 Aug 2014 13:06:23 +0000 (14:06 +0100)
commit45822644dc75d615b30c7d5b13e9ec26e46f12bf
treea3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a
parent195403c45134c867501c866e4337dabbd1c08016
parent5ec2d85db3419b120b27e363c7db4747ecf16ac7
Merge branch 'devicetree/next-overlay' into devicetree/next

Conflicts:
drivers/of/testcase-data/testcases.dts
drivers/of/Makefile
drivers/of/base.c
drivers/of/selftest.c
drivers/of/testcase-data/testcases.dts
include/linux/of.h