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

Merge branch 'fix/wm8962' of... 

Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-wm8962

Conflicts:
	sound/soc/codecs/wm8962.c
parents 9c24b167 2e7ee15c
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