Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 15 Sep 2011 23:54:25 +0000 (00:54 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 15 Sep 2011 23:54:25 +0000 (00:54 +0100)
commitcc2115cbfc63da72890160da01608b3189dd1b74
tree6f178677ebeec498ee4c5765adb71e1f90da37c8
parentf998f257c92216df314610dd5aebc5f5d23e6ec0
parent4f6c7e159361b330d767b107226bcc6938abad16
Merge branch 'for-3.1' into for-3.2