From:  Hanna Linder <hannal@us.ibm.com>

From: René Scharfe <l.s.r@web.de>

  this fixes a trivial error in isofs/inode.c, and reformats
  the surrounding code a bit to (hopefully) enhance clarity.

  i_mtime.tv_nsec was initialized twice, and i_ctime.tv_nsec never

From:  Rusty Russell <rusty@rustcorp.com.au>

  Trivial unused var...

From: René Scharfe <l.s.r@web.de>

  This un-complicates a small piece of code of the dev/pts filesystem
  and decreases the size of the object code by 8 bytes for my build.

  Yay! :)

From:  Tom Rini <trini@kernel.crashing.org>

  The following marks videodev_proc_destory as __exit.

  This is safe as its only caller is marked as __exit as well.

From:  Pavel Machek <pavel@ucw.cz>

  This kills a compile warning in swsusp

From:  Stephen Rothwell <sfr@canb.auug.org.au>

  This allows some architecture to override the generic implementations
  on {get,put}_compat_flock64 as some of them (ia64 and maybe x86_64)
  will take alignment faults when accessing the loff_t members of struct
  compat_flock64.

  Requested by David Mosberger, modified by Dave Miller.

From:  Pavel Machek <pavel@ucw.cz>

From:  Pavel Machek <pavel@ucw.cz>

  This adds some more commentary to the boot-up code.

From:  Scott Russell <scott@pantastik.com>

  - missing release_region (reported by kbugs.org)
  - removed extraneous return (Randy Dunlap)

From:  Pavel Machek <pavel@ucw.cz>

  This fixes url in ioctls, fixes some kernel parameters, kills comment
  in tty that is 10+ years old and wrong, and adds me a little
  credits.

From:  Jonathan Corbet <corbet@lwn.net>

  This fixes a couple of little mistakes in Documentation/NAPI_HOWTO.txt;
  I also updated the interrupt handler stuff while I was at it.  Jamal Hadi
  Salim has seen and acked it.

From:  Scott Russell <scott@pantastik.com>

  - Rearranged unreachable code reported via kbugs.org

From:  Matthew Wilcox <willy@debian.org>

  These defines are simply not used any more.

From:  Jesse Barnes <jbarnes@sgi.com>

  Quick add to the maintainers file for SN (aka Altix 3000) support in
  the kernel.

From:  Adrian Bunk <bunk@fs.tum.de>

  the patch below removes the unneeded #define LinuxVersionCode from
  eata.c. It's not used and if it was needed KERNEL_VERSION in
  include/linux/version.h does the same.

From:  Steven Cole <elenstev@mesatop.com>

  This is a slightly improved version of the additional help texts for
  sound/oss/Kconfig.  The originals were obtained from 2.4.21-pre4.

From:  Scott Russell <scott@pantastik.com>

  - Rearranged unreachable code reported at kbugs.org

From:  Adrian Bunk <bunk@fs.tum.de>

  The following trivial patch updates the short description for
  BLK_DEV_HPT366 (the HPT372 and the HPT374 are supported, too):

From:  Jonathan Corbet <corbet@lwn.net>

  This fix has been acked by James Bottomley, but has not risen above Linus's
  threshold.

From:  Rusty Russell <rusty@rustcorp.com.au>

  I don't think it's misused anywhere, but it's better to be safe.

  Pointed out by Joern Engel.

From:  Scott Russell <scott@pantastik.com>

  - moved return to eliminate unreachable code reported by kbugs.org

From:  Amit Shah <shahamit@gmx.net>

  The read function for consoles in include/linux/console.h contains const
  char* for a pointer that it will actually modify. Although no one seems
  to be using this as of now, it should be corrected.

No longer need to call the 68328 specific int setup. Now all
done by the common 68328 int handler code.

No longer need to call the hardware specific int setup.

This is now done in the common int handler for 68328
sub-architecture.

Modify the m68knommu/68328 specific ints.c to be the general ints
handler when building for this sub-architecture. It is just simpler to
have one for each sub-architecture (which means we currently need 3
for the 3 prominant m68knommu families). Each can handle the hardware
setup differences, and there is a few at this level. This doesn't
really add much code overall, since 2 of the 3 m68knommu architectures
already had significant specific int handling code.

Add a config entry for defining static boot parameters
for m68knommu architecture.

CONFIG_BLK_DEV_LVM is gone, but there is still some associated code.
This is the include/linux/compat_ioctl.h part.

I consider myself the maintainer of this code, created the file,
want to destroy it again. It is unused and incorrect today.

CONFIG_BLK_DEV_LVM is gone, but there is still some associated code.
This is the x86_64 part.

CONFIG_BLK_DEV_LVM is gone, but there is still some associated code.
This is the parisc part.

s390 network device driver fixes:
 - Make use of SET_MODULE_OWNER.
 - Fix ctc interrupt handler.

Bug fixes for the s390 tape device driver:
 - Remove tapechar_init() from mem.c. It is called via module_init anyway.
 - Remove unnecessary #include <version.h>
 - Make tape_block compile. Add fixme.
 - Export symbols needed by tape discipline drivers.

s390 console driver fixes:
 - Register console ttys via module_init. Remove sclp_tty_init and
   tty3215_init from tty_io.c
 - con3215: use set_current_state.
 - sclp: Fix race condition in sclp interrupt handler. Fix deadlock on
   sclp_conbuf_lock for certain error conditions.

s390 block device driver fixes:
 - dasd: Don't continue on error in dasd_increase_state. Use hex_ascii view
         for the dasd debug area. Fix typo.
 - xpram: Fix setup of devfs_name.

s390 32 bit compatability fixes:
 - Fix compat entries in the system call table.
 - Update to new compat_ioctl mechanism.
 - Define compat_alloc_user_space.

Remove unnecessary MOD_INC_USE_COUNT/MOD_DEC_USE_COUNT pairs.

cio: Add code to break a reservation of a device (steal lock).

Add module alias support for ccw devices.