Merge tag 'davinci-for-v3.19/edma' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:55:58 +0000 (17:55 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:55:58 +0000 (17:55 +0100)
Pull "Adds suspend/resume support to EDMA driver" from Sekhar Nori:

* tag 'davinci-for-v3.19/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: common: edma: add suspend resume hook

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge