]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/of-graph-base' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorRob Herring <robh@kernel.org>
Wed, 5 Jul 2017 13:24:05 +0000 (08:24 -0500)
committerRob Herring <robh@kernel.org>
Wed, 5 Jul 2017 13:24:05 +0000 (08:24 -0500)
commit2cf6708397ddb60ee98703ac61dea9437c085e69
tree59f198e06e2cdd9a49b2eb815f1ad18e0a63f241
parentdcaf22c5fbb1497beaf43e82c5929a900549ada1
parenta303ad9898cdf7c1407106458dc42ad9924755d4
Merge branch 'topic/of-graph-base' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into dt/property-move

OF graph changes for ALSA conflict with the move of graph functions into
property.c.
drivers/of/base.c
drivers/of/property.c