Merge branch 'reset/explicit-api' into reset/next
authorPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 29 Jun 2016 21:39:52 +0000 (23:39 +0200)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Wed, 29 Jun 2016 21:39:52 +0000 (23:39 +0200)
1  2 
include/linux/reset.h

Simple merge