summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-25 13:27:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-25 13:27:35 -0700
commitdb84abf5f8075a739bfd73ddc432e6b8fe3ec4b6 (patch)
treea739d7c9feaaac63f624770e38938c1b4420318d /fs
parent04faac10fcd2d0f7af8183fa02dea26919e29571 (diff)
parent6e5461d774bf42aae622ad0f3ff53e41962f886b (diff)
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
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/file.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/fs/ubifs/file.h b/fs/ubifs/file.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/fs/ubifs/file.h
+++ /dev/null