]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 722d0da 22de453)
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:56:19 +0000 (14:56 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:56:19 +0000 (14:56 +0900)
Conflict due to the fix for the register map failure - taken the for-3.1
version.

Conflicts:
sound/soc/codecs/sgtl5000.c

1  2 
sound/soc/codecs/sgtl5000.c patch | diff1 | diff2 | blob | history
sound/soc/codecs/wm_hubs.c patch | diff1 | diff2 | blob | history

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