Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9939b14b

Commit 9939b14b authored 9 years ago by Mark Brown

Downloads
- Plain Diff

Merge remote-tracking branches 'asoc/topic/ssm2518' and 'asoc/topic/sunxi' into asoc-next

parents 71831ef6 ce7b8dbd c570b82c

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/sound/sun4i-codec.txt 0 additions, 6 deletions

Documentation/devicetree/bindings/sound/sun4i-codec.txt
sound/soc/codecs/ssm2518.c 0 additions, 6 deletions

sound/soc/codecs/ssm2518.c
sound/soc/sunxi/sun4i-codec.c 5 additions, 12 deletions

sound/soc/sunxi/sun4i-codec.c

with 5 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment