Merge branch 'for-3.0' into for-3.1
commit84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 11:47:06 +0000 (6 12:47 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 11:47:06 +0000 (6 12:47 +0100)
tree78cf08595c7175669ef6d20c686ab43a49ea8090
parentaa72f6899b9fb3dc824c458234ae3507a60e462d
parent6ac340623c5d2a945030814d900701439772ff57
Merge branch 'for-3.0' into for-3.1
sound/soc/codecs/wm8915.c