into home.transmeta.com:/home/torvalds/v2.5/linux

1) apic_write_around(APIC_ID, boot_cpu_physical_apicid) places the APIC
value in the lower 8 bits of APIC_ID, when it should be in the upper 8. As
as result, it effectively forces the APIC id to always be 0 for the boot
CPU, which is fatal on SMP AMD boxes.

 Fix: don't do the write at all. The APIC_ID value should be right already.

2) phys_cpu_present_map = 1 means we always set bit 0, but later on
   in setup_local_APIC() we do
        if (!clustered_apic_mode &&
            !test_bit(GET_APIC_ID(apic_read(APIC_ID)), &phys_cpu_present_map))
                BUG();
and the bug is triggered if the APIC_ID is not zero.

 Fix: initialize 'phys_cpu_present_map' correctly.

into redhat.com:/garz/repo/net-drivers-2.5

into redhat.com:/garz/repo/net-drivers-2.5

        In kernel 2.5.63, you have moved more wireless LAN drivers
into ../drivers/net/wireless/. Unfortunately, there was a bit more to
cleanup as the result of this work.
        You will need to :
                o Apply the attached patch
                o rm /drivers/net/pcmcia/aironet4500_cs.c

        Have fun...

        Jean

P.S. : You will notice that I took the liberty to organise the config
option in what I hope is a more logical order.

* call netif_tx_disable after netif_poll_disable, fixing TX race,
  in tg3_netif_stop
* follow the ordering of the tg3_netif_stop change, and enable
  poll after waking TX, in tg3_netif_start
* after doing those two steps in tg3_netif_start, check for work
  using new helper function tg3_cond_int
* add helper function tg3_cond_int, which delivers an interrupt
  if and only if the status block was updated (i.e. if work
  is likely to be available)

* do not hold driver spinlock during RX processing in tg3_poll
  (this is the deadlock fix)
* create netif_poll_{en,dis}able to synchronize against dev->poll()
* create __netif_rx_complete to avoid a third irq-save in tg3_poll
* create tg3_netif_{start,stop} as driver-specific helper functions
  which disable and enable NAPI polling and TX queueing.  Note that
  the TX queueing enable/disable is purely advisory, and is not
  intended to prevent any races.
* remove tg3_halt call from tg3_set_power_state, as all callers
  have already called tg3_halt, making it redundant.  Removing this
  function call also eliminates some locking complications.
* use new helper __netif_rx_complete in tg3_poll
* create tg3_reset_task, as a function that runs in process context
  which resets the NIC.  This is needed because tg3_netif_stop()
  calls schedule() in the process of disabling dev->poll.
* schedule tg3_reset_task from tg3_tx_timeout
* schedule tg3_reset_task from tg3_timer
* wrap several tg3_halt...tg3_init_hw sequences with
  tg3_netif_stop...tg3_netif_start.  In addition to synchronizing
  with dev->poll, this additionally fixes bugs where we were not
  calling netif_wake_queue, when we should have been.
* move netif_start_queue call to very bottom of tg3_open
* add missing tg3_netif_{start,stop} to tg3_{suspend,resume},
  further fixing obvious bugs.

into redhat.com:/garz/repo/net-drivers-2.5

    accomodate -> accommodate
    accomodated -> accommodated
    accomodates -> accommodates

    guarentee -> guarantee
    guarenteed -> guaranteed
    guarentees -> guarantees

    uglyness -> ugliness

    boundry -> boundary
    boundries -> boundaries

    invokation -> invocation

    wether -> whether

(A "wether" is a castrated goat.)

    immediatly -> immediately

    wierd -> weird
    wierdo -> weirdo
    wierdness -> weirdness

This patch replaces its (possessive of it) with it's (it is)
in the following cases where "it is" is meant.

its a   -> it's a
its an  -> it's an
its not -> it's not

except for the files
   arch/cris/boot/rescue/head.S
   arch/cris/kernel/kgdb.c
where the substitution is "its not" -> "it is not"
to avoid possible problems with single quotes in assembly comments.

This patch replaces it's (it is) with its (possessive of it)
in the following cases where the possessive of it is meant.

to it's      -> to its
into it's    -> into its
from it's    -> from its
of it's      -> of its
with it's    -> with its
under it's   -> under its
about it's   -> about its

into home.transmeta.com:/home/torvalds/v2.5/linux

use the standard pr_debug macro instead of TRDBG

Make Muli Ben-Yehuda the maintainer for trident as per Alan's suggestion

The M5451 can sometimes not come out of reset.

This is non fatal and it continues to work fine, so print a nasty message
but don't fail the driver initialization.

Now that we search for 11 different sections by name, the if/else was
getting unwieldy.  Also, handle_section just does relocs, so it's a bit
of a misnomer, and it's best simply moved into the main code.

This open-codes handle_section, which simply does relocations now.

Also adds "find_sec" and uses it to find the various sections.

Bob Miller points out that the try_module_get in use_module() can, of
course, fail.  Secondly, there is a race between setting the module
live, and a simultaneous removal of it.

This includes asm/unistd.h in the vector handling code for m68knommu.
It needs the local NR_syscalls define.  linux/unistd.h is not assembler
clean, so it must be asm/unistd.h.

This patch creates a local NR_syscalls define for the m68knommu
architecture.

This includes unistd.h in the high level vector handling code.  It needs
NR_syscall.

This adds m68k defines for __kernel_timer_t and __kernel_clockid_t.  The
reset signal changes means these are now needed.

This creates a sturcture to mirror the m68knommu/ColdFire CPU timer
hardware.  This is a much cleaner approach to accessing the timer
registers than the previous set of register address defines.

This modifies the m68knommu siginfo include file to use
asm-generic/siginfo.h instead of the asm-m68k/siginfo.h.

The asm-generic/siginfo.h is more appropriate here, and
the m68k is out of date.

This includes asm/unistd.h in the system call table setup code for
m68knommu.  It needs the local NR_syscalls define.  linux/unistd.h is
not assembler clean, so it must be asm/unistd.h.

    dont -> don't (135 occurrences)

    wont -> won't (21 occurrences)

    doesnt -> doesn't (35 occurrences)

    couldnt -> couldn't (4 occurrences)

    cant -> can't (28 occurrences)