Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Feb 2020 20:41:00 +0000 (12:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Feb 2020 20:41:00 +0000 (12:41 -0800)
Pull vboxfs from Al Viro:
 "This is the VirtualBox guest shared folder support by Hans de Goede,
  with fixups for fs_parse folded in to avoid bisection hazards from
  those API changes..."

* 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: Add VirtualBox guest shared folder (vboxsf) support

1  2 
MAINTAINERS
fs/Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc fs/Makefile
Simple merge