Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'davinci' into for-2.6.32 

Conflicts:
	sound/soc/davinci/davinci-i2s.c
parents 4ec5c969 efd13be0
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment