diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /arch/powerpc/boot/.gitignore | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/powerpc/boot/.gitignore')
| -rw-r--r-- | arch/powerpc/boot/.gitignore | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore index 45c9ad23526e..0734b2fc1d95 100644 --- a/arch/powerpc/boot/.gitignore +++ b/arch/powerpc/boot/.gitignore | |||
| @@ -1,19 +1,32 @@ | |||
| 1 | addnote | 1 | addnote |
| 2 | empty.c | ||
| 3 | hack-coff | ||
| 2 | infblock.c | 4 | infblock.c |
| 3 | infblock.h | 5 | infblock.h |
| 4 | infcodes.c | 6 | infcodes.c |
| 5 | infcodes.h | 7 | infcodes.h |
| 6 | inffast.c | 8 | inffast.c |
| 7 | inffast.h | 9 | inffast.h |
| 10 | inffixed.h | ||
| 8 | inflate.c | 11 | inflate.c |
| 12 | inflate.h | ||
| 9 | inftrees.c | 13 | inftrees.c |
| 10 | inftrees.h | 14 | inftrees.h |
| 11 | infutil.c | 15 | infutil.c |
| 12 | infutil.h | 16 | infutil.h |
| 13 | kernel-vmlinux.strip.c | 17 | kernel-vmlinux.strip.c |
| 14 | kernel-vmlinux.strip.gz | 18 | kernel-vmlinux.strip.gz |
| 19 | mktree | ||
| 15 | uImage | 20 | uImage |
| 16 | zImage | 21 | zImage |
| 22 | zImage.chrp | ||
| 23 | zImage.coff | ||
| 24 | zImage.coff.lds | ||
| 25 | zImage.lds | ||
| 26 | zImage.miboot | ||
| 27 | zImage.pmac | ||
| 28 | zImage.pseries | ||
| 29 | zImage.sandpoint | ||
| 17 | zImage.vmode | 30 | zImage.vmode |
| 18 | zconf.h | 31 | zconf.h |
| 19 | zlib.h | 32 | zlib.h |