git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5886c74
f4a75d2
)
Merge tag 'v3.7-rc6' into asoc-arizona
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 19 Nov 2012 06:43:50 +0000
(15:43 +0900)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 19 Nov 2012 06:43:50 +0000
(15:43 +0900)
Linux 3.7-rc6
Conflicts:
sound/soc/codecs/wm5102.c
Trivial merge