Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

arch/ia64/lib/memcpy.S

@@ -13,8 +13,6 @@
  *	Stephane Eranian <eranian@hpl.hp.com>
  *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
-#include <linux/config.h>
-
 #include <asm/asmmacro.h>
 
 GLOBAL_ENTRY(bcopy)

arch/ia64/sn/io/sn1/pcibr.c

@@ -7485,7 +7485,7 @@ pcibr_device_flags_set(devfs_handle_t pconn_vhdl,
 
 #ifdef LITTLE_ENDIAN
 /*
- * on sn-ia we need to twiddle the the addresses going out
+ * on sn-ia we need to twiddle the addresses going out
  * the pci bus because we use the unswizzled synergy space
  * (the alternative is to use the swizzled synergy space
  * and byte swap the data)

include/asm-ia64/sal.h

@@ -535,7 +535,7 @@ typedef struct sal_log_pci_comp_err_info
     u64             reg_data_pairs[1];
     /* array of address/data register pairs is num_mem_regs + num_io_regs
        elements long.  Each array element consists of a u64 address followed
-       by a u64 data value.  The oem_data array immediately follows the the
+       by a u64 data value.  The oem_data array immediately follows the
        reg_data_pairs array */
     u8              oem_data[1];        /* Variable length data */
 } sal_log_pci_comp_err_info_t;

include/asm-ia64/sn/alenlist.h

@@ -15,7 +15,7 @@
 
 /*
  * An Address/Length List is used when setting up for an I/O DMA operation.
- * A driver creates an Address/Length List that describes to the the DMA 
+ * A driver creates an Address/Length List that describes to the DMA 
  * interface where in memory the DMA should go.  The bus interface sets up 
  * mapping registers, if required, and returns a suitable list of "physical 
  * addresses" or "I/O address" to the driver.  The driver then uses these