diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-20 13:36:02 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:36:02 +0200 |
commit | 5aa664d63391c14f52264eb08d70f8a074ae249e (patch) | |
tree | 539134746d006e25f1d893a3a170bb94388bd86e /Documentation/devicetree/bindings/rng | |
parent | ASoC: sgtl5000: Add MicBias voltage support (diff) | |
parent | ASoC: sgtl500: Document the required supplies (diff) | |
download | linux-5aa664d63391c14f52264eb08d70f8a074ae249e.tar.xz linux-5aa664d63391c14f52264eb08d70f8a074ae249e.zip |
Merge branch 'fix/sgtl5000' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
Conflicts:
Documentation/devicetree/bindings/sound/sgtl5000.txt
Diffstat (limited to 'Documentation/devicetree/bindings/rng')
0 files changed, 0 insertions, 0 deletions