tree c2beb41548c9879c55811e8e027c9c89d23e3fdc
parent 9ba365438a532436ecd96a089fb29b01516bed33
parent 82babbb361f207a80cffa8ac34c2b6a0b62acc88
author Linus Torvalds <torvalds@linux-foundation.org> 1315525772 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1315525772 -0700

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

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine/ste_dma40: fix memory leak due to prepared descriptors
  dmaengine/ste_dma40: fix Oops due to double free of client descriptor
  dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free().
  dmaengine/ste_dma40: add missing kernel doc for pending_queue