Fix merge conflicts with asm-generic/vmlinux.lds.h change.
Fix ordering of large alignment data sections.

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core

Some error checking was added ca. 2.5.58 that would remove a device from 
its bus's list of devices if device_attach() returned an error. This 
included errors returned from drv->probe(), and the -ENODEV error returned
if the device wasn't bound to any driver.

This was BAD since it was perfectly fine for a device not to bind to a 
driver immediately, and for drivers to return an error on probe() if the 
device doesn't exactly qualify as one it supports. 

This changes device_attach() and driver_attach() to both return void, 
instead of an error, since they really can never fail hard enough to cause
the device or driver to be removed from the bus. 

multiple times under certain circumstances.

This fixes svc_tcp_recvfrom().

Found by Ted Phelps <phelps@dstc.edu.au>

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

The pci_enable_device() function will fail at least on i386 (see
arch/i386/pci/i386.c: pcibios_enable_resource (line 260)) if the
resources have not been assigned previously.  Hence the ostensible
resource collisions.

I added a small comment (and modified another) so future janitors won't
move pci_enable above pci_assign_resource again.

Here are some minor fixes and cleanups to the cpia (Creative WebCam II et
al) driver.  These have been extracted from the sourceforge CVS archive,
and I'd like to get these in before a larger change to the parallel port
code to support more transfer modes.

This patch contains:
  * cpia: use the <linux/list.h> list implementation, instead of cpia specific
    version.
  * cpia_pp: don't clear camera list after cameras have been registered (as
    this prevents them being deregistered, and oops after module
    unload).
  * hold cpia_pp list spinlock while walking list, not just during the
    element removal.

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

into kroah.com:/home/linux/linux/BK/gregkh-2.5

  speedtouch: use SpeedTouch everywhere (was sometimes Speed Touch).

  speedtouch: make more functions static.

  speedtouch: kill receive queue tasklet on shutdown (race pointed
out by Oliver Neukum).

Current uses of the urb_list have all been to make
sure we have some list of pending urbs, so we can
clean them all up after HCs die, and avoid trying
to unlink something that's not actually linked.
So order hasn't mattered.

This makes the order be FIFO, which is more useful
for other purposes.  Like being the HCD's internal
schedule, or dumping for debug.

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core

sys_quotacl tries to do a get_super on a struct block_device * to which
it doesn't hold a reference (nor does it actually have to be non-NULL).

As lookup bdev by name is a rather common operation I splitted out a new
helper, lookup_bdev() that does this out of open_bdev_excl and switched
quota.c to use it.  lookup_bdev() holds a proper reference that needs
to be dropped by bdput(), and it's well documented.

The use of umode_t instead of devfs-specific char vs block #defines
in Adam's mini-devfs patch makes sense independant of whether his patch
should get merged.  While reviewing his changes I also notices that
most of the number allocation functionality in devfs has no business
beeing exported.  In addition I cleaned up devfs_alloc_devnum/
devfs_dealloc_devnum a bit.

It's simply not needed anymore in 2.5

Have I already mentioned that the intermezzo code isn't exactly nicely
readable? ..

- fix cpufreq drivers compilation on not-bleeding-edge-gcc's (Adrian Bunk)
- gx-suspmod.c hasn't had a name yet

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

It's annoying having to touch 20+ arch vmlinux.lds.S file for every
new section introduced, just because they all duplicate the same
statements. Since we preprocess vmlinux.lds.S anyway, let's
#include <asm-generic/vmlinux.lds.h> and share the common statements.

This is a first step in consolidating most of the read-only sections.

into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.make

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn

Adding a check for allocation failure was a good idea, it just needs
checking the right variable...

Now it actually even compiles.

From Jeff.Wiedemeier@hp.com:

Bump non-legacy start addr to 16mb to accomodate new larger
SRM console footprint.

Adds the summit subarch hook to the config file, and updates various things
all inside the summit subarch directories (ie this can't possibly break
anyone else ;-)). The Summit's subarch had got out of sync in a few places.

Patch from James Cleverdon & John Stultz

Changes IO_APIC_MAX_ID to depend on the APIC type we're using.
The Summit machines have to use a larger set of bits in the apic registers,
we enlarge under ifdef for Summit only. We enlarge MAX_APICS for summit
as well as NUMA-Q (it would be nice to move this to subarch, but it creates
circular dependency problems ... I'll fix this up later).

Adds a check for the newer Summit boxes with a different name.

Patch from James Cleverdon & John Stultz

The IRQ balancing code currently assumes that the logical apicid is
always '1 << cpu', which is not true for the larger platforms.
We express this as an abstracted macro instead, and move the
cpu_to_logical_apicid definition to subarch, so we can make it exactly
"1 << cpu" for normal machines - maximum speed, minimum change risk.

A couple of things are abstracted from the smp_boot_cpus loop in order
to enable us to use the bios_cpu_apicid array to boot cpus from without
disturbing the code path of current machines.