into nuts.ninka.net:/home/davem/src/BK/net-2.5

. Use kerneldoc style in some structs and functions
. use ANSI C99 style labeled elements
. remove unused DPRINT macro in ddp.c
. reduce the window for module loading race in atif_add_device

into nuts.ninka.net:/home/davem/src/BK/net-2.5

. export tcp_bind_hash
. use tcp_bind_hash in tcp_v6_get_port
. create tcp_v6_bind_conflict from code in tcp_v6_get_port, making
  it look more like tcp_v4_get_port
. create ipv6_rcv_saddr_equal to reduce the complexity in
  tcp_v6_bind_conflict
. check if the sock is AF_INET6 before looking into the pinet6
  area that is not present anymore in AF_INET4 struct sock, this
  fixes the bug reported by Carl Ritson on netdev
. replace __constant_hton* with hton*, as both generate the same
  code and __constant_* should be only used when initializing
  static variables

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

This patch  includes the innocuous bits from a larger one that
I'm still working on (mostly unlink fixes):

- updates comments
- flags TDs that were seen in the donelist
- removes some bogus whitespace (at EOL etc) and tabs
- checks for an enumeration issue that might cause trouble
- delays IRQs a bit more aggressively
- shortens TD submit paths a smidgeon (smaller ".o")
- updates some of the debug output
- sanitizes usb_make_path() output on the SA-1111

Get rid of #ifdefs in hid-core again. (For you, Greg.)
Move the uref generation code from hid-core to hiddev to make things cleaner.

The purpose of this patch is to trap all commands which have a bogus
request_bufflen.  Much logic is devoted to calculating the proper length of
the transfer, but according to discussions I've had on linux-scsi, this is
really a bug in whatever is originating the bad command.

Hopefully, after people use this patch for a while, we'll eliminate all the
offending sources and can remove quite a bit of logic from the driver.

One of my earlier patches backed out a change that fixed all
copy_to_user calls to properly return -EFAULT if needed. This puts the
change back in.

I've merged a patch Paul Stewart sent me some time ago, which should make life
easier for the guys writing UPS daemons.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

- Limit volume size at mount time to 2TiB on architectures where
  unsigned long is 32-bits (fs/ntfs/super.c::parse_ntfs_boot_sector()).
  This is the most we can do without overflowing the 32-bit limit of
  the block device size imposed on us by sb_bread() and sb_getblk()
  for the time being.
- Limit file/directory size at open() time to 16TiB on architectures
  where unsigned long is 32-bits (fs/ntfs/file.c::ntfs_file_open() and
  fs/ntfs/dir.c::ntfs_dir_open()). This is the most we can do without
  overflowing the page cache page index.

  Doesn't check request_region and doesn't release region on failed
  kmalloc.

 this one slipped through the last fix for the redeclarations i sent,
 please apply this on to of the other one.

 description:
   umount_tree() is just used in namespace.[ch], so it declaration
   belongs into namespace.h and not fs.h

 Use of the $ARCH variable is undocumented; the sparc and sparc64 ports
 define the bool constants CONFIG_SPARC32 and CONFIG_SPARC64 respectively
 for this purpose.

 Use of the $ARCH variable is undocumented; the alpha port defines the
 bool constant CONFIG_ALPHA for this purpose.

 Use of the $ARCH variable is undocumented; the sparc and sparc64 ports
 define the bool constants CONFIG_SPARC32 and CONFIG_SPARC64 respectively
 for this purpose.

 Use of the $ARCH variable is undocumented; the sparc and sparc64 ports
 define the bool constants CONFIG_SPARC32 and CONFIG_SPARC64 respectively
 for this purpose.

 1/14 definitions of CONFIG_SOUND have trivially different banners.

 The word EXPERIMENTAL in the banner for symbol CONFIG_HPT34X_AUTODMA
 was almost spelled right.

 [Rusty: this is a resend of 'PATCH 2.5: kconfig EXPERIMENTAL misspelled'
  with context trimmed to try to avoid spurious patch failure]

 Use of the $ARCH variable is undocumented; the sparc and sparc64 ports
 define the bool constants CONFIG_SPARC32 and CONFIG_SPARC64 respectively
 for this purpose.

 Some instances of the "bool" statement have what appear to be
 dependencies like "dep_bool" after the 2nd argument, which are
 silently ignored by all current parsers.  I have either trimmed
 the arguments or converted the "bool" to "dep_bool" as seemed
 appropriate.

 This patch just makes some stuff in ipc/ static.

 This is needed for things running on the host which want to know when UML
 panics, and what the panic message was.