From: Linus Torvalds Date: Thu, 12 Sep 2013 02:11:59 +0000 (-0700) Subject: Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3b38f56c9dc262c31391b5ae095178960108049b;p=openwrt%2Fstaging%2Fblogic.git 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 --- 3b38f56c9dc262c31391b5ae095178960108049b