From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 27 Feb 2012 14:25:51 +0000 (+0000)
Subject: Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci into... 
X-Git-Tag: firefly_0821_release~3680^2~3254^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5a8c271b26b83a09924c99aaa5c607021aed142b;p=firefly-linux-kernel-4.4.55.git

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
---

5a8c271b26b83a09924c99aaa5c607021aed142b