tree 46d8032c9f224d28f258c44727a7165c9ba47c85
parent 4ec5c9693b46ab34976511cd43bf75c3a0fc704d
parent efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1246990726 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1246990726 +0100

Merge branch 'davinci' into for-2.6.32

Conflicts:
	sound/soc/davinci/davinci-i2s.c