projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1341962 0cd5751)
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:56:57 +0000 (13:56 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:56:57 +0000 (13:56 +0100)
1  2 
sound/soc/mid-x86/sst_platform.c patch | diff1 | diff2 | blob | history
sound/soc/soc-compress.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/mid-x86/sst_platform.c
Simple merge
diff --cc sound/soc/soc-compress.c
Simple merge
Domain: System / Uncategorized;