Skip to content

L
linux
Commit 74d2b7a3 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-2.6.37' into for-2.6.38 

Conflicts:
	sound/soc/samsung/smartq_wm8987.c
parents 8c1b5306 2742f2ad
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