]> 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)
commitbe61382ffeeaf1198eff9e14879f9e746d947fe3
treea3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a
parent62ff50c0fbd52ab8da6fd18b1fad3c488bac0d5b
parent283a0e9bbb21791fe4a4a6439725bcfd82afd94f
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