projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8c1b530
2742f2a
)
Merge branch 'for-2.6.37' into for-2.6.38
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Wed, 5 Jan 2011 10:06:55 +0000
(10:06 +0000)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Wed, 5 Jan 2011 10:06:55 +0000
(10:06 +0000)
Conflicts:
sound/soc/samsung/smartq_wm8987.c
Trivial merge