Skip to content
Commit 4633fa48 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3 

Conflicts:
	sound/soc/codecs/wm8940.c
parents 03431972 19940b3d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment