into penguin.americas.sgi.com:/src/lord/bitkeeper/xfs-2.6

SGI Modid: 2.5.x-xfs:slinx:158642a

into kernel.bkbits.net:/home/lord/xfs-2.6

Use seq_file for /proc/misc

Use list macros for misc_device list.

This updates the maintainer entry for ACPI.  Len has already assumed
most of this responsibility, as other projects demand my attention.

My team will continue to maintain the OS-independent ACPI CA release,
but Len will be responsible for pulling ACPI CA updates into the Linux
release, and the rest of Linux-specific code in general.

This allows /proc/kcore to be entirely disabled and dropped out of the
kernel - we already select between a.out and ELF.

Right now it only drops /proc/kcore out of the kernel for ARM.

From: Liam Girdwood <liam.girdwood@wolfsonmicro.com>

This patch eliminates pop noises when doing a PM suspend/resume with the
WM9712 AC97 codec.

This implements the possibility for sharing a tag map between queues.
Some (most?) scsi host adapters needs this, and SATA tcq will need it
for some cases, too.

From Daniel Pittman <daniel@rimspace.net>

Using the lra (last recorded address) isn't always reliable on some
drives, so use the regular TOC if it returns 0 capacity.

I haven't been doing much smbfs work recently, but here are some bugfixes:

- Fix module unload (Angus Sawyer).
- Fix the smbfs error handling if kernel_thread() should fail.
- Allow high uids/gids to be used as the fake uid smbfs sets as file owner.

The as-iosched.c source code has said this is here for a long time but
it kept getting lost.

 From: bert hubert <ahu@ds9a.nl>

 LSM: To recap, this patch allows root_plug to work again. It needs functions
 that used to reside in capability.c but linking in capability.c, disabled
 root_plug from loading, as a security module is already present then. This
 patch splits out the functions root_plug needs from capability.c.

 From: John Levon <levon@movementarian.org>

 LSM: Update comments in register_security to reflect reality

 Add LSM maintainer entry

 Update CREDITS with new contact info.

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

Don't try to clear PCI status on devices which are no longer present.
Only clear PCI status bits which we're interested in.
Use pci_name to report the device name.

The IMPD-1 is a logic module (a stackable module) - rather than
trying to abuse platform devices, create our own bus type to handle
these.

into kernel.bkbits.net:/home/lord/xfs-2.6

SGI Modid: 2.5.x-xfs:slinx:158511a

SGI Modid: 2.5.x-xfs:slinx:158493a

This squashes another compiler warning.

Jamie Lokier's cache testing program discovered a problem which seems
to be present in some CPU write buffers.  This cset allows the kernel
to detect the flaw and activate a workaround to restore the user
space expectations.

Move ARM CPU configuration to arch/arm/mm.  Seperate out the selection
of the abort, cache handling, optimised page copying and TLB handling
from the Makefile, and move it into the configuration system.  This
allows us to select the correct files in arch/arm/mm and pick the
appropriate definitions in include/asm-arm/* based upon a config
symbol rather than a bunch of configuration symbols.

Also add ARM1020E, ARM1022 and ARM1026 CPU support.

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

Monotonic clock code uses reader/writer lock which is prone to same
starvation problems as we saw with xtime.  This patch changes it to seq_lock
which is faster and won't starve writers in face of lots of readers.

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

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

Introduce a new kernel-userspace interface that uses 128-bit file
identifiers instead of the previously used 96-bit fileids. We also
replacing the coda_creds structure with only the fsuid.

This new API has been used by for a couple of months now, people had to
patch their kernels whenever they want to run a current Coda release.
A new Kconfig option is added to fall back on the old API for older Coda
clients and other userspace filesystems that might use our protocol.