diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-09 14:46:12 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-09 14:46:12 +1000 |
| commit | 43d795c6320fce4c1b3b38ae764fb465230745ef (patch) | |
| tree | 7aa1af6cbdec4adcc569028f2842d7e4858fa426 /arch | |
| parent | 06e86849cf4019945a106913adb9ff0abcc01770 (diff) | |
| parent | c49f8789f532ae39019135ca038e9bc0d15aaa4a (diff) | |
| download | linux-3.10-43d795c6320fce4c1b3b38ae764fb465230745ef.tar.gz linux-3.10-43d795c6320fce4c1b3b38ae764fb465230745ef.tar.bz2 linux-3.10-43d795c6320fce4c1b3b38ae764fb465230745ef.zip | |
Merge remote branch 'gcl/powerpc/merge' into merge
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/boot/.gitignore | 1 | ||||
| -rw-r--r-- | arch/powerpc/boot/dtc-src/.gitignore | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore index 3d80c3e9cf6..12da77ec022 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 a7c3f94e5e7..00000000000 --- 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 |