Merge branch 'for-3.5' into for-3.6
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Jul 2012 09:45:07 +0000 (10:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Jul 2012 09:45:07 +0000 (10:45 +0100)
commit15d47763b354256053c390a9b7bc9f2b4f197711
tree6f516e0d3a3d5fb0174d06dfd6db268f4eb5b8ed
parent0ff97ebf0804d2e519d578fcb4db03f104d2ca8c
parentd66a547cddb9124cea6308c33e1f54c7c8db288f
Merge branch 'for-3.5' into for-3.6
sound/soc/codecs/tlv320aic3x.c
sound/soc/codecs/tlv320aic3x.h
sound/soc/codecs/wm8994.c
sound/soc/soc-dapm.c