diff options
| author | Benjamin Herrenschmidt | 2011-06-09 06:46:12 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2011-06-09 06:46:12 +0200 |
| commit | 43d795c6320fce4c1b3b38ae764fb465230745ef (patch) | |
| tree | 7aa1af6cbdec4adcc569028f2842d7e4858fa426 | |
| parent | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff) | |
| parent | dtc/powerpc: remove obsolete .gitignore entries (diff) | |
| download | kernel-qcow2-linux-43d795c6320fce4c1b3b38ae764fb465230745ef.tar.gz kernel-qcow2-linux-43d795c6320fce4c1b3b38ae764fb465230745ef.tar.xz kernel-qcow2-linux-43d795c6320fce4c1b3b38ae764fb465230745ef.zip | |
Merge remote branch 'gcl/powerpc/merge' into merge
| -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 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 |