summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-29 08:22:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-29 08:22:27 +0200
commit9cf6ffae380061b16b2b4269d4f2e1a50aa2508a (patch)
treeff03f182b1386e614fac1b3c58c3c5f1a2d51062 /fs/btrfs/ctree.c
parentb3a5ce874c2619c9b8a6c5bbcfefdb95e0227600 (diff)
parent9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 (diff)
downloadlinux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.tar.gz
linux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.tar.bz2
linux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.zip
Merge 5.8-rc3 into usb-next
We want the USB fixes in here, and this resolves a merge issue found in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs/ctree.c')
0 files changed, 0 insertions, 0 deletions