From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Mar 2014 03:30:43 +0000 (-0600)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: firefly_0821_release~176^2~4344
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3750c14022d185f4a583dda243f2f46f51ce1a2c;p=firefly-linux-kernel-4.4.55.git

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

Pull slave-dma fixes from Vinod Koul:
 "This request brings you two small fixes.  First one for fixing
  dereference of freed descriptor and second for fixing sdma bindings
  for it to work for imx25.

  I was planning to send this about 10days ago but then I had to proceed
  on my paternity leave and didnt get chance to send this.  Now got a
  bit of time from dady duties :)"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma: sdma: Add imx25 compatible
  dma: ste_dma40: don't dereference free:d descriptor
---

3750c14022d185f4a583dda243f2f46f51ce1a2c