Commit b8ba92b1 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'topic/of-graph-base' of...

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.
parents d20dc149 ac1e6958
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment