summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-20 19:55:09 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-20 19:56:01 -0800
commit1803f3389b7ac9ed33ea561b3b94e22e2864a95d (patch)
tree04821aaf55bc1d1f5504c7621c7672aad2fe1873
parent5d9c4a7de64d398604a978d267a6987f1f4025b7 (diff)
Remove empty file remnants that were left in the tree by mistake
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>
-rw-r--r--fs/xfs/Makefile-linux-2.60
-rw-r--r--include/asm-x86/desc_64.h1
2 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/fs/xfs/Makefile-linux-2.6
+++ /dev/null
diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h
deleted file mode 100644
index 8b137891791f..000000000000
--- a/include/asm-x86/desc_64.h
+++ /dev/null
@@ -1 +0,0 @@
-