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)
commitaf3e1629c8d0d26627f3dcc237a6facda8bb1090
treed475c09905f20e6dca0a9f9586bc38f5af9f58b3
parentcc7c2bb1493c4118d5ae69e350a405faf3ddfb89
parent0bcc0eab363aa80f79769324bf3f2ab7781840f2
Merge branch 'reset/explicit-api' into reset/next
include/linux/reset.h