]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'reset/reset/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:07:54 +0000 (09:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:07:54 +0000 (09:07 +1000)
commit37c5c4a0b28754baada06238a4ed1590cc1e681b
tree6ff5ee2e289f103343d90afe5229fafaf27c9c56
parent82eb79e809c0d3b726409f8cc84e14e548b79ea5
parent7941ad8d45e2613966d879746a7d52e7ba8db134
Merge remote-tracking branch 'reset/reset/next'

# Conflicts:
# drivers/reset/core.c
drivers/reset/Kconfig
drivers/reset/core.c