commit 43d795c6320fce4c1b3b38ae764fb465230745ef
author Benjamin Herrenschmidt <benh@kernel.crashing.org> Thu Jun 09 14:46:12 2011 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> Thu Jun 09 14:46:12 2011 +1000
tree 7aa1af6cbdec4adcc569028f2842d7e4858fa426
parent 06e86849cf4019945a106913adb9ff0abcc01770
parent c49f8789f532ae39019135ca038e9bc0d15aaa4a

Merge remote branch 'gcl/powerpc/merge' into merge

arch/powerpc/boot/.gitignore

diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 3d80c3e..12da77e 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -1,5 +1,4 @@
 addnote
-dtc
 empty.c
 hack-coff
 infblock.c

arch/powerpc/boot/dtc-src/.gitignore

diff --git a/arch/powerpc/boot/dtc-src/.gitignore b/arch/powerpc/boot/dtc-src/.gitignore
deleted file mode 100644
index a7c3f94..0000000
--- a/arch/powerpc/boot/dtc-src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-dtc-lexer.lex.c
-dtc-parser.tab.c
-dtc-parser.tab.h