]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'slimbus/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 08:09:22 +0000 (18:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 08:09:22 +0000 (18:09 +1000)
commit10baf5706689e91ff137c4eaf032a46ff2001099
treeb86d1719b850aea61496a92cb02893ec63825fa1
parentb2d6c170b8be3fc7378dbf7cfb9a266e3f5c0fab
parent0320ed0a82364b3b175ab83ad11c7e4d9ad828a9
Merge remote-tracking branch 'slimbus/for-next'

# Conflicts:
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile