Merge tag 'asoc-fix-v4.13-rc7' into asoc-linus

ASoC: Fixes for v4.13

A couple of fixes, one for a regression in simple-card introduced during
the merge window that was only reported this week and another for a
regression in registration of ACPI GPIOs.

# gpg: Signature made Thu 31 Aug 2017 12:50:29 BST
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "[email protected]"
# gpg: Good signature from "Mark Brown <[email protected]>" [unknown]
# gpg:                 aka "Mark Brown <[email protected]>" [unknown]
# gpg:                 aka "Mark Brown <[email protected]>" [unknown]
# gpg:                 aka "Mark Brown <[email protected]>" [unknown]
# gpg:                 aka "Mark Brown <[email protected]>" [unknown]
# gpg:                 aka "Mark Brown <[email protected]>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3F25 68AA C269 98F9 E813  A1C5 C3F4 36CA 30F5 D8EB
#      Subkey fingerprint: ADE6 68AA 6757 18B5 9FE2  9FEA 24D6 8B72 5D54 87D0

diff --cc sound/soc/generic/simple-card-utils.c
Simple merge