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

Merge tag 'v3.6-rc6' into for-3.7 

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
	sound/soc/omap/am3517evm.c
parents 2d6d649a 5698bd75
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