Switching the PCMCIA interrupts from serial PCI interrupts to parallel
PCI interrupts causes machines to hang solid.  If we leave such setups
well alone, and only change the interrupt mode of parallel PCI systems
between PCI+ISA and PCI only.

Rename the strangely named "ss_entry" structure to "ops".

Don't hide calls to the socket driver by "shorthand functions"

We were calling wake_up on an uninitialised wait queue.  Oops.
Fix this by ignoring events from the socket driver if we know that
the pcmcia thread is not running.

Since the cs.c pcmcia core has a per-socket thread, we don't need each
socket driver having a work queue and associated complexity.

Therefore, remove this complexity and allow the socket drivers to call
pcmcia_parse_events directly from their interrupt or timer handlers.

Remove register_callback methods.  Instead, allow socket drivers
pass their events directly into cs.c via pcmcia_parse_events().

Add work-around for i82365-based socket drivers to the core PCMCIA
code.  Since insert processing is not a time critical event, we can
afford to delay (by sleeping) these for everyone.

Get/Put module when we insert and remove a card.  This avoids a
potential deadlock when socket drivers are unloaded, and we have
a cardbus card known to the system.

Move ->owner field from socket operations to pcmcia_socket.  (This
change is mainly for the SA11xx drivers, which use a core driver
for the chip, and a separate module for all the machine specific
bits.)

 ETH1394  : - Minor cleanups.
            - Fix incorrect error handling with no broadcast channel.
	    - Set max/default MTU to 1500.
	    - Fix broken spinlock handling on device open.
 IEEE1394 : Make bus-nodeid printk's of a consistent format.
 OHCI1394 : Change one printk to a verbose/debug only message.

nmclan_cs doesn't compile with older compilers

From: Nick Piggin <piggin@cyberone.com.au>

It converts writes to reads and we end up returning the request to the wrong
queue.

The ext3 version number hasn't been updated since ext3 was merged.

We track ext3 via the kernel release ID.  Remove the ext3 version
number.

From: Philippe Elie <phil.el@wanadoo.fr>

kmem_cache_destroy() can fail with the following error: slab error in
kmem_cache_destroy(): cache `xxx': Can't free all objects but the cache
user really free'd all objects

This is because drain_array_locked() only frees 80% of thge objects.

Fix it by adding a parameter to drain_array_locked() telling it to drain
100% of the objects.

From: Bob Miller <rem@osdl.org>

Removed the check_mem_region() call and replaced with request_mem_region().

Because of the way the driver is structured the first request_mem_region()
call gets the default memory area.  After probing the complete memory area
that is needed to communicate with the device is known, so the first memory
area is released and the complete area is requested.

From: Bob Miller <rem@osdl.org>

- Replace the call to MOD_INC_USE_COUNT with a __module_get() when
  forcing the module to not be unloadable.

- Remove the check_region() calls and restructured things to only use
  request_region().

From: Kouichi ONO <co2b@ceres.dti.ne.jp>

in 2.5.73, I can't read/write mount DVD-RAM via ide-scsi (only r/o mount).
Without ide-scsi, I can mount DVD-RAM read/write mode and works fine.

(acked by Jens).

From: Andi Kleen <ak@suse.de>

Add proper EFAULT reporting to sys_syslog.

This fixes some silly LTP test in the 32bit emulation of an AMD64 kernel.

From: Oleg Drokin <green@namesys.com>

Fix BUG_ON(!buffer_mapped(bh)) in submit_bh()

Reiserfs is submitting unmapped buffers into submit_bh(), which trips a
BUG.

Make sure that the address_space is capable of performing the readahead
before going in and allocating the pages.

This fixes the kernel crash in the case when we do an SIOCSIFNAME
ioctl on /proc/net/dev to rename a network interface, and
we supply a string such as "foo%sbar".

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

into are.twiddle.net:/home/rth/BK/axp-2.5

Fix PPP over async regression that the PPPoE changes caused.
Basically, PPP puts a zero length skbuff in the receive queue
as an error token, and the last change caused that to get flushed
as bad data.

Thanks to Diego Calleja Garcia, Matthew Harrell for validating this.

hwif->udma_four is always preset to 0

Make the IDE driver return the proper status return
for unhandled interrupts.

- do not enable TCQ in ide_init_drive(), its too early
- enable TCQ in __ide_dma_on() only if CONFIG_BLK_DEV_IDE_TCQ_DEFAULT=y
- try to enable TCQ only on disk drives
- correct check for two drives on one channel

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

This patch moves all the duplicated cdrom Kconfig bits from arch/*/Kconfig
to drivers/cdrom/Kconfig