www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5b79cd0 3103f67)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 03:42:47 +0000 (13:42 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 03:42:47 +0000 (13:42 +1000)
commit	89f9c562217a6811fbe2c4c211b757b18f00f398
tree	8bfd315eb70d4e6bec28c9643d9e9a563935a9a6	tree
parent	5b79cd076450bf8bcff667766fbb8ad248e9e9e1	commit \| diff
parent	3103f67eb4400355fb03e98a61224a32b06f4f48	commit \| diff

Merge remote-tracking branch 'kspp/for-next/kspp'

# Conflicts:
# Makefile

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/iommu/amd/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/flexcan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/can/usb/etas_es58x/es58x_fd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ibmvscsi/ibmvscsi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/r8188eu/include/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723bs/include/ieee80211.h	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/linux/ieee80211.h	diff1 \|	diff2 \|	blob \| history
include/linux/string.h	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
lib/string.c	diff1 \|	diff2 \|	blob \| history
lib/string_helpers.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history
scripts/kernel-doc	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.