Skip to content
GitLab
Commit ed40d0c4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'origin' into devel 

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c
parents 9e495834 5d80f8e5
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment