tree ad8c359e136c2f0ef908ac0c03f3a0fba4ab7a57
parent c98137bfcb4afd4415864258dd8ecf05c2bb5843
parent b59e0f82aa350e380142353fbd30706092ba6312
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1358404314 +0900
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1358404314 +0900

Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona

Conflicts:
	sound/soc/codecs/arizona.c