Skip to content
Commit 15086ded authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39 

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c
parents 3e5ff4df 28e86808
Hide whitespace changes
Inline Side-by-side
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