]> err.no Git - linux-2.6/commitdiff
Remove empty file remnants that were left in the tree by mistake
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Feb 2008 03:55:09 +0000 (19:55 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Feb 2008 03:56:01 +0000 (19:56 -0800)
Noted by various people (Sam, Jeff, Roland..)

Commit 58b7983d15a422d9616bdc4e245d5c31dfaefbe2 intended to remove the
xfs "Makefile-linux-2.6" file, but it was mistakenly still left in the
tree as a empty file, and would cause git to correctly complain about a
tracked file being removed after a "make distclean" (which removes empty
files as garbage).

And the asm-x86/desc_64.h file was supposed to be removed by commit
c81c6ca45a69478c7877b729af1942d2b80ef582, but instead stayed around
containing just a single newline.

Get rid of them both properly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/xfs/Makefile-linux-2.6 [deleted file]
include/asm-x86/desc_64.h [deleted file]

diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-