Skip to content

Commit

Permalink
Merge branch 'for-2.6.37' into for-2.6.38
Browse files Browse the repository at this point in the history 
Conflicts:
	sound/soc/samsung/smartq_wm8987.c
  • Loading branch information
Mark Brown committed Jan 5, 2011
2 parents 8c1b530 + 2742f2a commit 74d2b7a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 74d2b7a

Please sign in to comment.