diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-02 04:30:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-02 04:30:43 +0100 |
| commit | 3750c14022d185f4a583dda243f2f46f51ce1a2c (patch) | |
| tree | 12ca1c6ebdc31e35bdf9235650b6866de3a78818 /drivers/vhost | |
| parent | Merge tag 'pm+acpi-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | dma: sdma: Add imx25 compatible (diff) | |
| download | linux-3750c14022d185f4a583dda243f2f46f51ce1a2c.tar.xz linux-3750c14022d185f4a583dda243f2f46f51ce1a2c.zip | |
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
Diffstat (limited to 'drivers/vhost')
0 files changed, 0 insertions, 0 deletions