git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 18 Mar 2014 15:20:12 +0000 (16:20 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 18 Mar 2014 15:20:12 +0000 (16:20 +0100)
commit	9ad2a24f370159c350e9ec5dd3b91a1f3d76234e
tree	b9dbbb5d9044a15357bccd614ff1268c4d6a12d1	tree \| snapshot (tar.gz zip)
parent	4569f2b7be6f30f0edd2319d91ba718b8f26e232	commit \| diff
parent	8cd9bf18d7ffa4ffa2b8c0a5f095320026ae5d41	commit \| diff

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 <arnd@arndb.de>