From: <viro@parcelfarce.linux.theplanet.co.uk>

Simplify the code, eliminate an unused variable warning.

From: Andreas Steinmetz <ast@domdv.de>

The attached patch adds the pci id 5961 to radeonfb.  Without the patch my
9200 displays only a blank screen.  lspci output below.

05:00.0 VGA compatible controller: ATI Technologies Inc Radeon RV280
[Radeon 9200] (rev 01) (prog-if 00 [VGA])
         Subsystem: Giga-byte Technology: Unknown device 4018
         Flags: bus master, 66Mhz, medium devsel, latency 64, IRQ 16
         Memory at e0000000 (32-bit, prefetchable) [size=128M]
         I/O ports at b800 [size=256]
         Memory at feaf0000 (32-bit, non-prefetchable) [size=64K]
         Expansion ROM at feac0000 [disabled] [size=128K]
         Capabilities: [58] AGP version 3.0
         Capabilities: [50] Power Management version 2

From: <miles@mcspd15.ucom.lsi.nec.co.jp> (Miles Bader)

make __delay function handle a loop count of zero.  In practice, this only
seems to occur in odd debugging situations, but it's quite annoying then.

From: <miles@mcspd15.ucom.lsi.nec.co.jp> (Miles Bader)

Define ARCH_HAS_*_EXTABLE macros for v850

From: <miles@mcspd15.ucom.lsi.nec.co.jp> (Miles Bader)

Add some #includes for the v850 to eliminate some compiler warnings

Always compile ide-dma.c if CONFIG_BLK_DEV_IDEDMA=y, mark PCI specific code
with CONFIG_BLK_DEV_IDEDMA_PCI for now (it should migrate to ide_pcidma.c
over a time).  This fixes a small bug - in_drive_list() from icside.c used
!strstr() instead of strstr() so it was missing two entries from a blacklist.

Let's play spot the bug here...

Amazing that it survives in modular case...

It was broken by IDE modular fixes in 2.6.2.

From: Matthew Wilcox <willy@debian.org>

From: Christoph Hellwig <hch@lst.de>

Instead of using the old MOD_INC_USE_COUNT and getting warnings all the
time preventing module unload can be much easier achived by just not
implementing a module_exit handler.

into intel.com:/home/lenb/src/linux-acpi-test-2.6.3

ARM added a definition for PT_SINGLESTEP which conflicted with
our definition.  So define PT_SINGLESTEP_BIT, PT_BLOCKSTEP_BIT and
PT_BLOCKSTEP to prevent similar problems in the future.  (James Bottomley)

Update harmony driver to the latest in the PA-RISC tree (Helge Deller)

PA-RISC also uses the 64-bit version of the IPC structs.

into home.osdl.org:/home/torvalds/v2.5/linux

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

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

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

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

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

Make the regular/HW accelerated xmit functions in the 8021q module
use the new set VLAN tag functionality to reduce code duplication.

Enable intermediate network drivers like bonding to get or set a
VLAN tag in an skb without a need to know about how tagging is done
according to a network adapter's capabilities.

Reimplement net_ratelimit() in terms of the new printk_ratelimit().

As net_ratelimit() already has it own sysctls we generalise
printk_ratelimit() a bit so that networking does not lose its existing
sysctls and so that it can use different time constants from the more generic
printk_ratelimit().

PA-RISC specific driver updates:

 - Stop pasting __FILE__
 - Improve card-mode Dino support (James Bottomley)
 - Fix dev->bridge rename (James Bottomley)
 - iosapic/SBA/LBA cleanups (Grant Grundler)
 - Improve LED support (Helge Deller)
 - Fix mux driver (Ryan Bradetich)
 - Make STI framebuffer work on RDI PrecisionBook (Helge Deller)

 - a500 & c3000 defconfigs (Grant Grundler)
 - Copyright and FSF address updates (Joel Soete, Grant Grundler)
 - Changes to fix dev->bridge conversion (James Bottomley)
 - Fix SuckyIO console (Grant Grundler)
 - Stop pasting __FILE__
 - More compat work (Carlos O'Donell)
 - Redo vmlinux.lds.S for x86-similarity (James Bottomley)
 - Move __ex_table into the writable section (Randolph Chung)

I need this to cope with some devices on PA-RISC and Russell also needs
something like it for PCMCIA.

Convert dev_alloc_name from O(n^2) lookup to O(n) by using a page as
bitmap to figure out how many devices of that pattern have been allocated.
This works for up to 32k devices (PAGE_SIZE*8) on i386, more on other
platforms.  Correctly handles the boundary cases where number of devices
won't fit because name length is limited.

Adds strnchr to the string libraries since we need to find the % format
character, but only care if it is in the first 15 bytes.