summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-09 14:46:12 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-06-09 14:46:12 +1000
commit43d795c6320fce4c1b3b38ae764fb465230745ef (patch)
tree7aa1af6cbdec4adcc569028f2842d7e4858fa426 /arch
parent06e86849cf4019945a106913adb9ff0abcc01770 (diff)
parentc49f8789f532ae39019135ca038e9bc0d15aaa4a (diff)
downloadblackbird-op-linux-43d795c6320fce4c1b3b38ae764fb465230745ef.tar.gz
blackbird-op-linux-43d795c6320fce4c1b3b38ae764fb465230745ef.zip
Merge remote branch 'gcl/powerpc/merge' into merge
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/.gitignore1
-rw-r--r--arch/powerpc/boot/dtc-src/.gitignore3
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 3d80c3e9cf60..12da77ec0228 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -1,5 +1,4 @@
addnote
-dtc
empty.c
hack-coff
infblock.c
diff --git a/arch/powerpc/boot/dtc-src/.gitignore b/arch/powerpc/boot/dtc-src/.gitignore
deleted file mode 100644
index a7c3f94e5e75..000000000000
--- 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
OpenPOWER on IntegriCloud