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

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

Merge branch 'for-2.6.37' into HEAD 

WARN() fix from Joe moved.

Conflicts:
	sound/soc/codecs/wm_hubs.c
parents 473f89ff 29c798fe
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