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)
commita6f5e6bdc25b6db98be44350ed15133c6601c1cd
tree24c5c773d56a3c1d2110314da0227087bb686c0c
parent4b3d4d3d2d69c29c09c38dbc99b4e2225724955a
parenta2b1175131ccb5d4a15456f4f31836356abbce09
Merge tag 'davinci-for-v3.19/edma' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/drivers

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>