From: Christoph Hellwig
Signed-off-by: Dave Jones <davej@redhat.com>

into delerium.kernelslacker.org:/mnt/data/src/bk/agpgart

- any device teardown must happen between agp_remove_bridge and
  agp_put_bridge, before agp_remove_bridge users can still call into
  the code
- it's releasing a reference to the wrong device

Original patch from: Christoph Hellwig
Further munging from Roland Dreier and myself.
Signed-off-by: Dave Jones <davej@redhat.com>

From: Christoph Hellwig
Signed-off-by: Dave Jones <davej@redhat.com>

From: Alan Hourihane
Signed-off-by: Dave Jones <davej@redhat.com>

From: Roland McGrath <roland@redhat.com>

The fxsave instruction does not save the x87 tag word (only the
empty bits), and we re-created the old-style x87 tags incorrectly.
The registers are saved in "stack order" in the save area, but the
tag word bits are in "hardware order", and we need to get the right
register state.

Both x86 and x86-64 needed this fix.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Ben Dooks

Update default configuraiton, configure support for the
common flash chips seen on 2410 board.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add platform device for the onboard site for NOR flash,
similar to the Simtec BAST (EB2410ITX)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Serial platfrom device to add ttyS0..ttyS4 to the
system.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add definition of the extra serial port area to the
file include/asm-arm/arch-s3c2410/vr1000-map.h

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Deepak Saxena

Previous fixed showed negative time flow every few hours during
extensive testing. This new version is much simpler and has been
tested w/o any failures.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

into pobox.com:/garz/repo/net-drivers-2.6

Patch from Richard Purdie

Add MMC support to enable the MMC device on the corgi machines
(Sharp SL-C7xx). This is a standard PXA implementation except the
interrupt needs to be delayed to see card removals.
Applies after 2405/1.

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

Patch from Richard Purdie

Add w100fb device definition to enable the framebuffer device on
the corgi machines (Sharp SL-C7xx).

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

Patch from Giorgio Padrin

Completes/fixes I2S GPIO modes definitions in file pxa-regs.h .
Needed by sound drivers using I2S interface; based onofficial microprocessor documentation.

Signed-off-by: Giorgio Padrin
Signed-off-by: Russell King

Patch from Ben Dooks

Add platform device data for the NAND slot and chips
on the Simtec BAST (EB2410ITX) for the 3 chips
and SmartMedia slot.
Note, this does not yet support hot-plug for the
SmartMedia slot.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add call to find out the current source and destination
of the given dma channel

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Remove the fixed base address from the IIS registers, and
add missing defines for the IISPSR register

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into kroah.com:/home/greg/linux/BK/block-2.6

into kroah.com:/home/greg/linux/BK/i2c-2.6

into kroah.com:/home/greg/linux/BK/pci-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6

into kroah.com:/home/greg/linux/BK/w1-2.6

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

RPC: Fix a module refcount leak in RPCSEC_GSS
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

profile_pc() used thread_saved_fp() with the current task.  However,
thread_saved_fp() only returns sane values when called for threads
which are presently sleeping, so this caused an oops.  Instead, use
regs->ARM_fp, which correspond with the frame pointer.

The build is clean now.

God invented symbolic names to help you.  Repeating magic constants by hand
is begging to lose, especially when you get them wrong.  Don't be a loser.

[ Editor's hint: 0xfffe000 vs 0xffffe000 ]
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>