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

Merge branch 'for-3.1' into for-3.2 

Remove the bodge for ad193x.

Conflicts:
	sound/soc/soc-io.c
parents b21a415d 0cc62e92
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