git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1025c05
c894e39
)
Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@linaro.org>
Fri, 2 May 2014 17:00:35 +0000
(10:00 -0700)
committer
Mark Brown
<broonie@linaro.org>
Fri, 2 May 2014 17:00:35 +0000
(10:00 -0700)
Conflicts:
sound/soc/codecs/Kconfig
Trivial merge