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

into cantab.net:/usr/src/tng-2.0.13

into cantab.net:/usr/src/tng-2.0.12

into cantab.net:/usr/src/tng-2.0.11

   This fixes an off by one error in getcolreg/setcolreg in matroxfb's
secondary head driver.

  When James converted all drivers to unified do_install_cmap(), he
blindly changed also matroxfb, which happily uses fbcon.currcon == -1.
This caused memory corruption because of memory before fb_display[]
array was overwritten.

  Default do_install_cmap() also installed invalid default color map in
some matroxfb resolutions.  Not all world have >= 4bpp.

Disable volume control irq on maestro module unload.

- Remove nr_mft_bits and the now superfluous union with nr_mft_records
  from ntfs_volume structure.
- Remove nr_lcn_bits and the now superfluous union with nr_clusters
  from ntfs_volume structure.
- Use iget5_locked() and friends instead of conventional iget(). Wrap
  the call in fs/ntfs/inode.c::ntfs_iget() and update callers of iget()
  to use ntfs_iget(). Leave only one iget() call at mount time so we
  don't need an ntfs_iget_mount().
- Change fs/ntfs/inode.c::ntfs_new_extent_inode() to take mft_no as an
  additional argument.

- Merge fs/ntfs/aops.c::end_buffer_read_mst_async() and
  fs/ntfs/aops.c::end_buffer_read_file_async() into one function
  fs/ntfs/aops.c::end_buffer_read_attr_async() using NInoMstProtected()
  to determine whether to apply mst fixups or not.
- Above change allows merging fs/ntfs/aops.c::ntfs_file_read_block()
  and fs/ntfs/aops.c::ntfs_mst_readpage() into one function
  fs/ntfs/aops.c::ntfs_attr_read_block(). Also, create a tiny wrapper
  fs/ntfs/aops.c::ntfs_mst_readpage() to transform the parameters from
  the VFS readpage function prototype to the ntfs_attr_read_block()
  function prototype.

- Move definition of ntfs_inode_state_bits to fs/ntfs/inode.h and
  do some macro magic (adapted from include/linux/buffer_head.h) to
  expand all the helper functions NInoFoo(), NInoSetFoo(), and
  NInoClearFoo().
- Add new flag to ntfs_inode_state_bits: NI_Sparse.
- Add new fields to ntfs_inode structure to allow use of fake inodes
  for attribute i/o: type, name, name_len. Also add new state bits:
  NI_Attr, which, if set, indicates the inode is a fake inode, and
  NI_MstProtected, which, if set, indicates the attribute uses multi
  sector transfer protection, i.e. fixups need to be applied after
  reads and before/after writes.
- Rename fs/ntfs/inode.c::ntfs_{new,clear,destroy}_inode() to
  ntfs_{new,clear,destroy}_extent_inode() and update callers.
- Use ntfs_clear_extent_inode() in fs/ntfs/inode.c::__ntfs_clear_inode()
  instead of ntfs_destroy_extent_inode().
- Cleanup memory deallocations in {__,}ntfs_clear_{,big_}inode().
- Make all operations on ntfs inode state bits use the NIno* functions.
- Set up the new ntfs inode fields and state bits in
  fs/ntfs/inode.c::ntfs_read_inode() and add appropriate cleanup of
  allocated memory to __ntfs_clear_inode().
- Cleanup ntfs_inode structure a bit for better ordering of elements
  w.r.t. their size to allow better packing of the structure in memory.

The last changes did trigger another latent bug in the inline assembly.
akpm noticed it because he compiles his kernels with frame pointers.

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

Uninline elv_next_request() and move it to elevator.c, where it belongs.
Because of CURRENT declaration, this actually saves lots of space.  From
Andrew.

init_rootfs() (from ramfs) doesn't appear in any header file.  I didn't
see any that looked like a good home, so lets put a prototype at the top
of fs/namespace.c.  This only use of this function is in namespace.c.

This patch makes sure the 3c509 module license is always GPL.  Currently
the MODULE_LICENSE() marco is only used when CONFIG_ISAPNP or
CONFIG_ISAPNP_MODULE is defined.  I have moved MODULE_LICENSE() to the
#ifdef MODULE section at the bottom of 3c509.c.

Same is true for the MODULE_DEVICE_TABLE() macro.

Not sure why I forgot to do this, but here is a small bit of tidying up
of some leftover parentheses from the memlist macro removal. The
parentheses are just noise and should go.

page_alloc.c does not use either slab.h or swapctl.h. This removes the
inclusion of those headers from page_alloc.c

nr_free_pages() is overly verbose. The following is perhaps clearer and
gets to the point with fewer lines of code and inside of 80 columns.

14 of our 17 architectures define sys_pause exactly the same
way.  The other three don't define it at all.  I assume glibc
translates pause() into sigsuspend() or something.

In favour of those now in kernel.h..

Three arch-determining symbols in drivers/mtd/maps/Config.in are wrong.
They have apparently been generated using the sensible pattern "CONFIG_FOO"
for an architecture "foo"; unfortunately the architectures are not sensible.

  CONFIG_SPARC should be CONFIG_SPARC32
  CONFIG_I386 should be CONFIG_X86
  CONFIG_SH should be CONFIG_SUPERH

Removed a spurious menu definition which was both a duplicate and
had no matching "endmenu".

Removed an "endmenu" for which there was no opening "mainmenu_option".

The config language is *not* shell.  The construct "[ foo ] || [ bar ]"
is legal in shell but not in the config language, where we should use
the equivalent "[ foo -o bar ]"

The format for the "choice" statement is:

  choice 'prompt' "{sub-prompt sub-symbol}*" default-value

and the following is *not* legal config language (note the
positioning of the closing double quote):

  choice 'prompt' "{sub-prompt sub-symbol}* default-value"

It only happens to work because of a combination of accidental
side effects of the current parsers:

  *   unpaired sub-words inside the 2nd word are silently ignored
  *   the missing last word is silently treated as if empty

Two symbols used in drivers/net/wan/Config.in are misspelled.

CONFIG_PPP_MULTLINK should be CONFIG_PPP_MULTILINK
CONFIG_PPP_SYNCTTY should be CONFIG_PPP_SYNC_TTY

1/2 definitions of CONFIG_PC_KEYB have trivially different banners.

1/3 definitions of CONFIG_PARPORT_1284 have trivially different banners.