OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4b8713f
b5c49d4
)
Merge branch 'for-3.1' into for-3.2
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:20:35 +0000
(20:20 +0100)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:20:35 +0000
(20:20 +0100)
Conflicts:
sound/soc/omap/mcpdm.c
sound/soc/omap/mcpdm.h
Trivial merge