From: Arnd Bergmann Date: Tue, 16 Dec 2014 20:43:15 +0000 (+0100) Subject: Merge tag 'renesas-defconfig-fixes-for-v3.19' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v3.19-rc1~58^2 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=5f1b2953da58e51e97eea9b7235545d72e9e1dab Merge tag 'renesas-defconfig-fixes-for-v3.19' of git://git./linux/kernel/git/horms/renesas into fixes Pull "Renesas ARM Based SoC Defconfig Fixes for v3.19" from Simon Horman: * Revert change enabling RCAR_AUDMAC_PP in shmobile_defconfig Unfortunately enabling RCAR_AUDMAC_PP support this patch breaks dmaengine support on R-Car Gen2 boards. This should be resolved by driver updates in v3.20. But v3.19 was too early for this defconfig change. * tag 'renesas-defconfig-fixes-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: Revert "ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig" Signed-off-by: Arnd Bergmann --- 5f1b2953da58e51e97eea9b7235545d72e9e1dab