Merge tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Aug 2018 20:27:35 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Aug 2018 20:27:35 +0000 (13:27 -0700)
commitdb84abf5f8075a739bfd73ddc432e6b8fe3ec4b6
treea739d7c9feaaac63f624770e38938c1b4420318d
parent04faac10fcd2d0f7af8183fa02dea26919e29571
parent6e5461d774bf42aae622ad0f3ff53e41962f886b
Merge tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs

Pull UBIFS fix from Richard Weinberger:
 "Remove an empty file from UBIFS source"

* tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs:
  ubifs: Remove empty file.h