From: Arnd Bergmann Date: Fri, 21 Nov 2014 11:59:18 +0000 (+0100) Subject: Merge tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin... X-Git-Tag: v4.14-rc1~6386^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00f879bed45148612e1065ac26e46a7a39e5c8d9;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc Pull "Berlin SoC changes for v3.19 (round 2)" from Sebastian Hesselbarth: - Do not select RESET_CONTROLLER as it is user selectable * tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: berlin: do not select RESET_CONTROLLER Signed-off-by: Arnd Bergmann --- 00f879bed45148612e1065ac26e46a7a39e5c8d9