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

Merge branch 'for-3.0' into for-3.1 

Trival fixup for move of I/O code into separate file.

Conflicts:
	sound/soc/soc-cache.c
parents 22315712 e9c03905
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