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

Add a missing inline, shows up when modules are turned off.

This is only used by pci hotplug and cardbus systems.

This is needed for drivers that want to use the driver_info field.

This patch removes the inofficial ioctls that were used to support the
PV8630 USB-over-Parport chipset. They were alreaded ifdefed out.
Instead of them, the more generic (and official) SCANNER_IOCTL_CTRLMSG
should be used. The last software that used the old ioctl
(sane-hp4200) switched to the new ioctls a long time ago.

This patch is ontop of the "user-supplied" patch.

With this patch, information about user-supplied ids is printed only
once at startup instead of everytime any USB device is plugged in.

The patch is on top of the new ids patch.

This patch adds vendor/product ids for two Visioneer scanners.

The patch is on top of the ioctl patch.

This patch removes the link in Kconfig to
Documentation/usb/scanner-hp-sane.txt which was removed by the
documentation update.

This patch updates the documentation for the USB scanner driver. The
details:

Documentation/usb/scanner.txt:
  - Amended for linux-2.5.54
  - Added information about read_timeout
  - Added more details about /proc/bus/usb/devices
  - Added/updated links
  - Added pointers two "special" scanner drivers
  - Reordering, spell-checking, formatting
  - Used /dev/usb/scanner[0-15] instead of /dev/usbscanner[0-15]
  - Removed some basic USB configuration stuff
  - Added EHCI
  - Removed some more references to HP

Documentation/usb/scanner-hp-sane.txt:
  Removed completely. This was a very outdated text for some HP
  scanners. All of this is explained in the documentation of the
  user-space SANE tools. Links and a short explanation about SANE was
  added to scanner.txt instead.

This is the (slightly adapted) patch you already apllied for 2.4.

This patch adds locking to ioctl_scanner() which was completely
lacking until now. The patch is originally from Oliver Neukum
<oliver@neukum.name>.

The patch was forward-ported from 2.4.

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

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

This was suggested by many people, Randy Dunlap being the most vocal :)

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

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

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

OK, the grand finale ... NUMA-Q is now moved into subarch, so we can
kill off the last vestiges - CONFIG_CLUSTERED_APIC, clustered_apic_mode,
and smpboot.h (which only contains machine specific stuff now anyway).
the esr_disable switch was the last bit, that goes to subarch too.

If you end up with an empty smpboot.h due to patch / bitkeeper interactions,
please remove it after this ...

This removes clustered_apic_mode from smpboot.c into subarch,
creating a headerfile "mach_wakecpu" for all the cpu wakeup stuff.
This is pretty much the last of clustered_apic_mode ... ;-)

To be honest, I have no idea what I was smoking when I wrote this
originally, and it's kind of coincidental that it works at all currently.

We never use physical apicids after the cpus are all booted, so we should
just store the logical IDs which all subsequent things use. The only things
that were using the apicid->cpu mapping were hokey anyway, and it's hard to
maintain for machines that have a large apic addressing space (eg P4s
in clustered mode). Rips out everything except the mapping from
logical_apic_id -> cpu.

Moves check_phys_apicid_present() into subarch, and cleans up a
couple of stupid errors, and some bracketing issues in the macros.

Patch from James Cleverdon

Changes do_boot_cpu to return an error code, instead of trying to
work it out later by magic and voodoo. Removes the other usage
of apicid->cpu which is hard to maintain cleanly.

Patch originally by Matt Dobson. Reworked a little by me.

Stores the mappings between cpus and nodes in an array, instead of
working them out every time. Gives about 4% off systime for kernel
compile (we use these for every page allocation), and removes one
of the two only usages of apicid->cpu mapping, which is really awkward
to keep for systems with large apic spaces, and is genererally pretty
useless anyway (later patch removes).

Create a generalised apicid_to_node mapping, replacing the local
apicid_to_quad I had just locally in NUMA-Q subarch before.

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

This simply uses generic_file_aio_read and generic_file_aio_write

Thanks to Dave Jones for pointing this out.

Thanks to Dave Jones for pointing this out.

into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5

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

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