From: Arnd Bergmann Date: Thu, 12 Jul 2012 12:44:35 +0000 (+0200) Subject: Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc X-Git-Tag: firefly_0821_release~3680^2~2402^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3;p=firefly-linux-kernel-4.4.55.git Merge branch 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6 into next/soc From Roland Stigge : This is the pull request including the fix for the compile error caused by lpc32xx-next and dma branches collisions in linux-next. * 'lpc32xx/core-fixes' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: Adjust to pl08x DMA interface changes Signed-off-by: Arnd Bergmann --- 478e1a141c6c5d6c060ff0af9dfcf88aa6f59ac3