Skip to content

L
linux
Commit 6010c4c6 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-3.1' into for-3.2 

Conflicts:
	sound/soc/omap/mcpdm.c
	sound/soc/omap/mcpdm.h
parents 4b8713fd b5c49d49
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7