Skip to content
Commit 10121a12 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.31' of... 

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

Conflicts:
	MAINTAINERS
parents 28d0325c dd5e8e6b
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