]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 02:11:59 +0000 (19:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Sep 2013 02:11:59 +0000 (19:11 -0700)
commit3b38f56c9dc262c31391b5ae095178960108049b
tree9e1ec7eaf97548cb14f43fc67bf5eb1599bbe220
parentb3b7568490bb66688ee64f4ab72ec697f4f983c5
parentaca0156a9c4ba47ca021b69d1fd7442aff49a7ab
Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA-mapping fix from Marek Szyprowski:
 "A build bugfix for the device tree support for reserved memory
  regions.  Due to superfluous include the common code failed to build
  on ARM64 and MIPS architectures.

  The patch that caused the build break has lived at linux-next for
  about two weeks and noone noticed the issue, what convinced me that
  everything was ok"

* 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  drivers: of: fix build break if asm/dma-contiguous.h is missing