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

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-pcmcia

Trivial CREDITS update

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

The mdelay() macro does the wrong thing if you try to use it with an
argument expression that contains the (perfectly natural) variable name
'msec'.

Fix it to use an internal variable that doesn't clash with normal
naming.

into kernel.bkbits.net:/home/davem/net-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

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

- Add TG3_FLG2_SUN_5704, set it at probe time.
- Do not try to use NVRAM on Sun 5704 chips.
- Handle lack of firmware on Sun 5704 chips.

- Use ino-bitmap property to figure out which PCI bus
  module each interrupt gets routed through.
- Fix timeout setting in PCI control register
- Do not enable DTO interrupts.
- Use the correct IGN in INOs on Tomatillo.

This uses fat_get_short_entry() in fat_dir_empty(). Moves fat_scan() and
fat_subdirs() to dir.c.

From Ren <l.s.r@web.de>

the function vfat_strnicmp() has just one callsite. Inlining it
actually shrinks vfat.o slightly.

From Ren <l.s.r@web.de>

there are several places inside fs/vfat/namei.c where the length of a
struct qstr without any trailing dots is calculated. The patch below
adds a function vfat_striptail_len() which does that and makes use of it.

This uses ->i_pos instead of ->i_ino on fat_fs_panic() because ->i_ino
is not useful.

loff_t is _signed_ long long, so format string should use "%lld".


 fs/fat/cache.c |   14 +++++++-------
 fs/fat/inode.c |    2 +-
 fs/fat/misc.c  |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

This adds the forgotten test whether it's negative dentry.  That test
should be needed only in negative dentry case.

Removes unneeded dcache_lock.

(NOTE: vfat still has the filename case problem on mkdir(), rename() etc.)

Allows all architectures to simply include the sound/Kconfig file.
Now somebody can finally update the comment for CONFIG_SOUND ;-).

and move help comment to CONFIG_BLK_DEV_PDC202XX_OLD