Merge branch 'davinci' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jul 2009 18:18:46 +0000 (19:18 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jul 2009 18:18:46 +0000 (19:18 +0100)
commit3f405b46a91c0c4cdfa6077b4e1853f35a94e8ef
tree46d8032c9f224d28f258c44727a7165c9ba47c85
parent4ec5c9693b46ab34976511cd43bf75c3a0fc704d
parentefd13be09e2db4ac4efa2c6101c4f50ee1ead4b0
Merge branch 'davinci' into for-2.6.32

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