projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11dd604 3fe0607)
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 11 Mar 2015 12:53:41 +0000 (12:53 +0000)
1  2 
sound/soc/intel/sst-haswell-dsp.c patch | diff1 | diff2 | blob | history
sound/soc/intel/sst-haswell-ipc.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/intel/sst-haswell-dsp.c
Simple merge
diff --cc sound/soc/intel/sst-haswell-ipc.c
Simple merge