]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f49f851 dbec3b3)
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 00:53:23 +0000 (00:53 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Dec 2011 00:53:23 +0000 (00:53 +0000)
1  2 
sound/soc/mxs/mxs-pcm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/mxs/mxs-pcm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.