Skip to content
GitLab
Explore
Sign in
Commit
e8f00c1b
authored
Sep 26, 2013
by
Mark Brown
Browse files
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
Conflicts: sound/soc/fsl/imx-sgtl5000.c
parents
9ff50721
50d4a790
Changes
462
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment