aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark Brown2014-03-23 14:00:42 +0000
committerMark Brown2014-03-23 14:00:42 +0000
commitcab648a436e9173cc34e13f913c7c127d1f09110 (patch)
treecd016c4fc7957ce338d7bddb9228dbc97c973742 /.gitignore
parentd66fa86956149a211db3d7ae9e9f2536b65ccde4 (diff)
parent56fe48976db38ed3984e0e68b71e503e8179dd89 (diff)
Merge tag 'asoc-v3.15-2' into asoc-next
ASoC: Updates for v3.15 This is mostly a few additional fixes from Lars-Peter, a new driver and cleaning up a git failure with merging the Intel branch (combined with an xargs failure to pay attention to error codes). The history lists a bunch of additional commits for the branch but the content of those commits is actually present already but not recorded in history due to git failing. Unfortunately xargs is used in the merge script and it doesn't do a good job of noticing errors from the commands it invokes. # gpg: Signature made Thu 13 Mar 2014 14:25:44 GMT using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" # gpg: aka "Mark Brown <broonie@debian.org>" # gpg: aka "Mark Brown <broonie@kernel.org>" # gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>" # gpg: aka "Mark Brown <broonie@linaro.org>" # gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions