In order to bring the 2.4 and 2.6 versions in sync, here is the
missing bit for the meye driver :)

This updates the sonypi driver to the latest version:
        * document the fact that FX501/FX702 laptops are not supported

        * add battery insert/remove events (thanks to Daniel K.)

        * improve the event detection using a different port offset
          on 'type2' models (thanks to Daniel K.)

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

Atari floppy: Add missing includes and remove some unnecessary includes

M68k: Set last in switch_to(), fix asm constraints (from Andreas Schwab)

Amiga floppy: Add missing includes and remove some unnecessary includes (from
Roman Zippel)

Amiga z2ram: Add missing includes and remove some unnecessary includes

M68k: asm/local.h just includes the generic version (from Roman Zippel)

M68k: asm/sections.h just includes the generic version (from Roman Zippel)

Bartlomiej Zolnierkiewicz:
>   o ide: disk geometry/capacity cleanups
>   o ide: always store disk capacity in u64

Forgot to update the Macintosh IDE driver:

Kai Germaschewski:
>   o kbuild: Move generation of vmlinux.lds.s into arch/.../kernel

This forgot to move two files:

    mv arch/m68k/vmlinux-std.lds arch/m68k/kernel
    mv arch/m68k/vmlinux-sun3.lds arch/m68k/kernel

added the exclusion between ADD_PARTITION/DELETE_PARTITION/open() (BLKPG
ioctls didn't grab ->bd_sem when they should have).

added bdev->bd_part; it is set at open() to point to the hd_struct of
partition in question, reset on final close.

blk_partition_remap() uses ->bd_part instead of the current mess

  ->bd_offset is gone, we use ->bd_part->start_sect instead

added missing ->release() to hd_struct kobject, moved kfree() into it

  ->bd_part cotributes to refcount of hd_struct - we bump it when

  ->bd_part is set and drop when it's reset.

new helper - imajor(inode)

new helper - iminor(inode); defined as minor(inode->i_rdev); lots and
lots of places in drivers had been switched to it.

struct block_device made the private part of bdevfs inodes; bd_count
is gone, we use ->i_count of inode now; separate hash is also gone and we
are using iget5_locked()/igrab()/iput() instead.

Now that floppy_open() stores bdev in opened_bdevs[drive], we can remove
crap from floppy_read_block_0() and have it use that bdev instead of
messing with bdget_disk()/setting ->bd_disk by hand/bdput().

removed dead code from sparc64 hugetlbpage.c

 - hpfs_unlink() should not try to truncate the victim unless it's a
   regular file; truncate will not help for anything else and it will
   screw the page cache if victim happens to be a block device.
 - network filesystems should *not* invalidate page cache of block
   device node when inode gets invalidated; fixed, added a new helper -
   invalidate_remote_inode(). 
 - nfs setattr syncs the file before sending SETATTR to server; that
   makes a lot of sense for regular files, but not for anything else.
   Fixed.

removed bogus uses of ->i_sb->s_dev in intermezzo (comparizons can and
should simply compare ->i_sb, printks should use ->s_id).

jffs used to put kdev_t values on disk - blind copy of in-core
representation.

Switched to explicit use of u16 (which is what kdev_t currently is),
with appropriate conversion

killed gratitious uses of kdev_t in tpqic02

tty_paranoia_check() switched from kdev_t to struct inode.

removed unused kdev_t stuff, fixed a typo left from the
console->device() conversion.

Fix up interrupt handler type to be irqreturn_t.

Fix up interrupt handler type to be irqreturn_t.

Fix up interrupt handler type to be irqreturn_t.

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

this patch fixes the share state sequenceid bookeeping.

- increment the sequence id on an open that is confirmed
- increment the sequence id on close

2.4 kernels are very fussy about some values in the superblock, and
2.6 got them wrong.  This fixes it.

raid1 and multipath have not concept of a chunksize, so basing
max_sectors on it is obviously wrong.

Similary 'linear' has a very different concept of chunksize and
max_sectors doesn't apply.

raid5 does have relevant chunk_size concept, but it has code to
effectively handle any chunksize.

So we only need to set max_sectors based on chunk_size in raid0.

If we get a failure trying to allocate a stripe_head for a read-ahead
request (the only time we can get a failure), we skip the rest of the
request and fail the whole bio.

We don't need to explicitly count references as:
 - refcounting already happens for opens of /dev/md?
 -  when an array is active, a daughter module is loaded which
      locks "md" in.
We just need to make sure we clean up properly on unload. (export_array)

Also, xor needs a null module_exit so that it can be unloaded.

The queue init is really far too verbose at boot time.  I don't think
these messages add anything to either the end user experience or debug
ability. 

Acked by Jens

This assigns the queue properly.

Make everything compile and boot again.

 - Update defconfig
 - Some minor cleanup
 - Introduce physid_t for APIC masks (fixes UP kernels)
 - Add bandaid for CardBus bridges and broken BIOS (Vojtech)
 - Add bandaid for unsynchronized TSCs  (Vojtech)
 - Fix ffs(0) return value (fixes XFS) 
 - Fix compilation with software suspend

synchronize_irq() requires an argument when built with CONFIG_SMP.

As discussed earlier. This implements Linus' idea of printing
the addresses in /proc/<pid>/maps as 32bit if possible.

This works around some broken 32bit programs that cannot parse
64bit addresses as generated by x86-64 kernels.

Also simplifies the code slightly.

CONFIG_ACPI_SLEEP doesn't compile without SOFTWARE_SUSPEND.
Make it select it automagically.

This fixes some bugzilla bug whose number I forgot.