Merge branch 'reset/arc' into reset/next
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 18 Oct 2017 13:55:44 +0000 (15:55 +0200)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 18 Oct 2017 13:59:30 +0000 (15:59 +0200)
commit542befbb18056c4fda7b458aa6146a52b2fd389c
tree5963eb9f0e4acda6ef6ac5cb3e82d83fafdd389f
parentf0e0ada67dfd8342fd411da6e3bff10ff9bcc97b
parent376349232a93645624426db782cafe688054e6d6
Merge branch 'reset/arc' into reset/next

Merge the AXS10x driver, which is also merged into
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git for-next
MAINTAINERS
drivers/reset/Kconfig
drivers/reset/Makefile