]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6be1f47 014fd22)
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 09:49:32 +0000 (10:49 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 1 Sep 2014 09:49:32 +0000 (10:49 +0100)
1  2 
sound/soc/fsl/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/fsl/fsl_esai.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/fsl/Kconfig
Simple merge
diff --cc sound/soc/fsl/fsl_esai.c
Simple merge
Emulex OneConnect RDMA Driver