]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jun 2012 17:38:19 +0000 (10:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Jun 2012 17:38:19 +0000 (10:38 -0700)
Git pull DMA-mapping fix from Marek Szyprowski:
 "Another minor fixup for ARM dma-mapping redesign and extensions merged
  in this merge window"

* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: fix buffer chunk allocation order


Trivial merge