Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 19:22:43 +0000 (20:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 19:22:43 +0000 (20:22 +0100)
commitb42af319f26bcb7d84b42b4bd0ca3b84ba94b160
tree73b0fcf1e06f5d7e6d8f01476365b65c92d15bc5
parentdff2836707a40868766ec37c0869ff60adfc5706
parent3bdf28feafc52864bd7f17b39deec64833a89d19
Merge branch 'for-3.1' into for-3.2
sound/soc/codecs/wm8996.c