diff options
| author | Rob Herring <robh@kernel.org> | 2017-07-05 08:24:05 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-07-05 08:24:05 -0500 |
| commit | b8ba92b101e82b82a5359dc2dfbd772eb46780d4 (patch) | |
| tree | 59f198e06e2cdd9a49b2eb815f1ad18e0a63f241 /scripts | |
| parent | d20dc1493db438fbbfb7733adc82f472dd8a0789 (diff) | |
| parent | ac1e6958d3be29a28889b09e4eec1798eccc1606 (diff) | |
| download | lwn-b8ba92b101e82b82a5359dc2dfbd772eb46780d4.tar.gz lwn-b8ba92b101e82b82a5359dc2dfbd772eb46780d4.zip | |
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.
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions