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

In some cases, we're reading the wrong bits for large tags.  This patch corrects
the issue by setting the affected bits forward by an offset of 2 (skipping over
the size portion of the tag).

Must have missed it earlier, but the pci module parameter is not needed.

The irq index is used instead of the dma index when parsing dmas.

This patch adds the "get" command because at this point it is needed
for debugging.

If a device is disabled when initially read, its blank resource data will not
be cleared and the pnp layer will assume incorrectly that the device has
already been configured.  This patch resolves the issue by initializing the
resource table if the device is found to be disabled.

Fixes a trivial typo in an export symbol macro.

This patch resolves the compiler warning caused by the depreciated check_region
function.  It may not be the best solution but check_region really is what is
needed here because we never actually have to call "request_region".  If prefered,
I could alternatively request and release but doing so would be less efficient.

This patch does the following...
1.) changes struct pnp_resources to pnp_option for clarity
2.) greatly cleans up resource option registration
3.) removes some of the current conflict prevention code in
order to increase flexibility, (users will have more control)
4.) various manager cleanups, resulting code is more efficient
5.) fixes the locking bugs many have reported (now uses a mutex)
6.) removes the conflict displaying interface
 - it is better to handle such things in user space
7.) also many misc. cleanups

This adds a separate SERIAL_8250_ACPI config option and makes the
8250_acpi.c code dependent on ACPI_BUS (since acpi_bus_register_driver()
is a prerequisite).

into kernel.bkbits.net:/home/davem/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

I don't understand what was on the mind of Procom programmers,
why do all this inverted logic? Its plain confusing, revert it.
Thanks to DaveM for asking if the logic was inverted, I should
have killed this weird stuff a long time ago :-\

With this we make it easier to write correct network families as less
details need to be taken into account, as well in the current state we
make the non-refcounting protocols (the ones still keeping deliver_to_old_ones
in the tree) suck less. 8)

Left a WARN_ON in sk_del_node_init for a while, so that we can catch cases
where we're using __sock_put on a struct sock that has refcnt == 1, which
is not the case for all the ones I tested.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

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

SECURITY_INIT doesn't work when it is placed inside an output section.
Use our own version instead.

All current CPUs of ARMv5 or later can have ECC memory and can
support write allocations.

Noticed by Jun Sun.

Fix a couple of minor build errors caused by the recent system device
changes.

Ensure virt_addr_valid(x) works correctly for pointers.
Add comments indicating that drivers should not use virt_to_phys
and/or __pa to obtain an address for DMA.

This cset makes use of our AMBA device model, thereby allowing the
"KMI" PrimeCell driver to become ARM platform independent.

The ICS525 clock chip is used in several different parts of the
Integrator platform.  Rather than duplicate the code, separate it
out so everyone can use it.

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

into nuts.ninka.net:/home/davem/src/BK/net-2.5

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

into kroah.com:/home/greg/linux/BK/i2c-2.5

Boot ROMs have talked TFTP forever.  Some do it over USB now.

  - switch to usb_buffer_alloc