into cantab.net:/home/src/ntfs-2.6-devel

into cantab.net:/home/src/ntfs-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

SGI Modid: xfs-linux:xfs-kern:174326a
Signed-off-by: Nathan Scott <nathans@sgi.com>

into cantab.net:/home/src/ntfs-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Nicolas Pitre

Missing prototype.

Patch from Nicolas Pitre

... and a comment fix in bonus

Patch from Tony Lindgren

Removes some dead code as noted by Russell King.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Signed-off-by: Kris Kersey <augustus@linuxhardware.org>
Signed-off-by: Dave Jones <davej@redhat.com>

Signed-off-by: Dave Jones <davej@redhat.com>

into cantab.net:/home/src/ntfs-2.6-devel

into cantab.net:/home/src/ntfs-2.6

into cantab.net:/home/src/ntfs-2.6-devel

into cantab.net:/home/src/ntfs-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Use NULL, not 0, where appropriate.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

- Remove 'arc' machine name from Makefile
- clk_set_rate() should return non-zero atm.
- proc-sa1100.S doesn't need asm/ptrace.h
- update mach-types
- kill line of spaces in clock.h

Generate SIZEOF_MACHINE_DESC using asm-offsets method rather than
relying on people updating the definition in asm/mach/arch.h

This places arch_adjust_zones along side ISA_DMA_THRESHOLD.  These
two are related, but having them in separate files means its not
obvious that they are.

ISA_DMA_THRESHOLD is a DMA mask which must be defined such that it
matches the memory handed out by GFP_DMA, which in turn is controlled
by arch_adjust_zones.

This allows machine classes to override ISA_DMA_THRESHOLD as
necessary.

Clean up bzImage target, remove a couple of obsolete testing targets,
and add better bootpImage help text.

This fixes the buggy decompressor assembly, and fixes PCMCIA IO
to use the correct byte lane when accessing certain PCMCIA cards.

Static data causes GOTOFF relocations to be used, which won't work
because we want to relocate the .data section separately from the
.text section.  Therefore, force all data to be nonstatic.

- use 'Image' target for kernel image to be compressed rather than
  duplicating its generation.
- use .incbin-based generation of ELF objects from binary data rather
  than 'ld'-based generation.

For clarity and consistency, use the same name for makefile and
linker symbols.