Merge branch 'davinci' into for-2.6.32

Conflicts:
	sound/soc/davinci/davinci-i2s.c
This commit is contained in:
Mark Brown 2009-07-07 19:18:46 +01:00
commit 3f405b46a9
7 changed files with 1073 additions and 113 deletions