From: Arnd Bergmann Date: Tue, 18 Mar 2014 15:20:12 +0000 (+0100) Subject: Merge tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ad2a24f370159c350e9ec5dd3b91a1f3d76234e;p=linux.git Merge tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti into next/drivers Merge "STi Reset controller support" from Srinivas Kandagatla: * tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: STi: Add reset controller support to mach-sti Kconfig drivers: reset: stih416: add softreset controller drivers: reset: stih415: add softreset controller drivers: reset: Reset controller driver for STiH416 drivers: reset: Reset controller driver for STiH415 drivers: reset: STi SoC system configuration reset controller support Signed-off-by: Arnd Bergmann --- 9ad2a24f370159c350e9ec5dd3b91a1f3d76234e