summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ufs/ufs-mediatek.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-12-23 00:15:05 +0100
committerDavid S. Miller <davem@davemloft.net>2019-12-23 00:15:05 +0100
commitac80010fc94eb0680d9a432b639583bd7ac29066 (patch)
tree2de924c048910abfbfff52a3d5188a790ead379f /drivers/scsi/ufs/ufs-mediatek.h
parentMerge tag 'wireless-drivers-next-2019-12-20' of git://git.kernel.org/pub/scm/... (diff)
parentMerge tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff)
downloadlinux-ac80010fc94eb0680d9a432b639583bd7ac29066.tar.xz
linux-ac80010fc94eb0680d9a432b639583bd7ac29066.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Mere overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/ufs/ufs-mediatek.h')
0 files changed, 0 insertions, 0 deletions