From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Sep 2012 19:15:37 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: firefly_0821_release~3680^2~2060
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=06b050eb81b877c7a4adb6be8624ad3890fee9f2;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "There are two trivial fixes in pl330 driver and two in at_hdmac
  driver."

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  DMA: PL330: Check the pointer returned by kzalloc
  DMA: PL330: Fix potential NULL pointer dereference in pl330_submit_req()
  dmaengine: at_hdmac: check that each sg data length is non-null
  dmaengine: at_hdmac: fix comment in atc_prep_slave_sg()
---

06b050eb81b877c7a4adb6be8624ad3890fee9f2