diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-09 11:20:56 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-09 11:20:56 +1000 |
commit | e2d88a5ea69d8abfc024c7c89119bf1a8466d395 (patch) | |
tree | 5e73c949d1856af89665e6ba2b4e974ffc474561 | |
parent | 35d781801db3329b64e8e466aafec333464500c5 (diff) | |
parent | 3d1431431ce29536fe1ea174123e433fbfbb2323 (diff) | |
download | linux-next-e2d88a5ea69d8abfc024c7c89119bf1a8466d395.tar.gz |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git
# Conflicts:
# drivers/of/Makefile
# include/linux/of.h
0 files changed, 0 insertions, 0 deletions