Merge tag 'davinci-fixes-for-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 19:51:05 +0000 (21:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 19:51:05 +0000 (21:51 +0200)
This patch fixes setup of second EDMA channel controller
on DA850.

* tag 'davinci-fixes-for-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: edma: Fix configuration parsing for SoCs with multiple eDMA3 CC


Trivial merge