diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-13 12:02:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-13 12:02:03 -0400 |
commit | 75c531881bdd600c0b9906482ae21e96d35bc377 (patch) | |
tree | 4ae74013285d4be5c97fec92e630913648b44fec /fs/btrfs/root-tree.c | |
parent | 9d05746e7b16d8565dddbe3200faa1e669d23bbf (diff) | |
parent | 2f6d8fad0a1636e675308088c35e863d066e0949 (diff) |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Another week, time to send another fixes request taking time out of
extended weekend for the festivities in this part of the world.
We have two fixes from Sergei for rcar driver and one fixing memory
leak of edma driver by Geyslan"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: edma.c: remove edma_desc leakage
rcar-hpbdma: add parameter to set_slave() method
rcar-hpbdma: remove shdma_free_irq() calls
Diffstat (limited to 'fs/btrfs/root-tree.c')
0 files changed, 0 insertions, 0 deletions