]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59b2858 6acf399)
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jan 2015 18:26:24 +0000 (06:26 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jan 2015 18:26:24 +0000 (06:26 +1200)
commit298e320431db1db52b9ddd6f242bb33a4ea2d094
treeef1ce12b65b2989958559c6a51dbde9b9cff08ddtree
parent59b2858f57bbd42f36aa177d21ab011a87da3de2commit | diff
parent6acf3998d2c7420b2deb2b475fa78ba7573c6162commit | diff
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "Two patches, the first by Andy to fix dw dmac runtime pm and second
  one by me to fix the dmaengine headers in MAINTAINERS"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: dw: balance PM runtime calls
  MAINTAINERS: dmaengine: fix the header file for dmaengine
MAINTAINERS diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror