Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci...

Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical

* 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: map default_queue to edma channels