]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a178065 abd31b3)
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:52 +0000 (15:51 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:52 +0000 (15:51 +0100)
1  2 
sound/soc/soc-core.c patch | diff1 | diff2 | blob | history
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
XArray, radix tree and IDR