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

Merge branch 'tegra' into for-2.6.40 

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig
parents 97945c46 47912a65
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment