]> git.proxmox.com Git - mirror_ubuntu-jammy-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)
commitb8ba92b101e82b82a5359dc2dfbd772eb46780d4
tree59f198e06e2cdd9a49b2eb815f1ad18e0a63f241
parentd20dc1493db438fbbfb7733adc82f472dd8a0789
parentac1e6958d3be29a28889b09e4eec1798eccc1606
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