git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4324812 7b8751a)
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 13:02:07 +0000 (14:02 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Jun 2014 13:02:07 +0000 (14:02 +0100)
Conflicts:
sound/soc/fsl/Kconfig

1  2 
sound/soc/fsl/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/fsl/fsl_ssi.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/fsl/Kconfig
Simple merge
diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge
Pandora Kernel Repository