mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-22 13:37:49 +07:00
13dfb3fa49
Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
fdp | ||
microread | ||
nfcmrvl | ||
nxp-nci | ||
pn533 | ||
pn544 | ||
s3fwrn5 | ||
st21nfca | ||
st95hf | ||
st-nci | ||
Kconfig | ||
Makefile | ||
mei_phy.c | ||
mei_phy.h | ||
nfcsim.c | ||
port100.c | ||
trf7970a.c |