Skip to content
GitLab
Commit 5a4cfce7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38 

Conflicts:
	sound/soc/soc-core.c

Axel's fix on two different branches.
parents 6b3ed785 2a7b1a00
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