Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 13:00:08 +0000 (14:00 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 13:00:08 +0000 (14:00 +0100)
commitfef24d92a649ba1415c0a834259048153a2ab30a
tree6530bae4e72ce16de600fee8e9f602fa96f9be2b
parentfbf04076ef9b704ab27dbd1b2f97569227775bb4
parenta41619455c0e28b6973471e87f1702c6129d3439
Merge branch 'for-3.1' into for-3.2
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8996.c
sound/soc/samsung/speyside_wm8962.c