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

From: Alan Cox <alan@lxorguk.ukuu.org.uk>
(some changes by me - bart)

The current driver looks at fields before it is safe to, we move the
mod15rm bug handler to be a fixup and this ensures the probe has been
completed before we use the ident data.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Alan Cox <alan@lxorguk.ukuu.org.uk>
(some changes by me - bart)

We add probe_hwif_init_with_fixup (seperate naming as requested by
Bartlomiej). This runs a fixup on present interfaces before attaching
the drives. In order to be useful we need also an _with_fixup version
of ide_register_hw function. 

The sometimes troublesome undecoded slave detector is moved to its own
function and exported so that ide-cs and the upcoming delkin_cb can both
use it (along with any arch specific cf/pcmcia drivers I don't know
about). The non-relevant checks for this scenario are removed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Chris Wedgwood <cw@f00f.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Chris Wedgwood <cw@f00f.org>
(minor changes by me - bart)

Remove some accumulated (unused) cruft from ide.h
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide_hwif_setup_dma() calls pci_set_master() if necessary.
pci_set_master() (indirectly via pcibios_set_master()) sets
PCI_LATENCY_TIMER to a "reasonable" value.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Grant Grundler <grundler@parisc-linux.org>
(minor changes by me - bart)

Move Superio (NatSem 87560) IDE hacks into the ns87415 driver
instead of exporting IDE data structures.

To date, only PA-RISC port is known to use the 87560 chip.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

sata_[misc,scr] and priv are write-only
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

Patch from Tony Lindgren

This patch by Tuukka Tikkanen updates the OMAP clock framework.
It also contains a patch by Juha Yrjölä to enable 216MHz rate
on 16xx.

Signed-off-by: Tony Lindgren 
Signed-off-by: Russell King

Patch from Tony Lindgren

This patch changes OMAP serial ports to use the standard 8250
autodetection.

Signed-off-by: Tony Lindgren 
Signed-off-by: Russell King

Patch from Ben Dooks

Ensure that TI OMAP systems are only offered if
the system is configured for TI OMAP.

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

Patch from Ben Dooks

Fix IDCODE for S3C2410A to add missing zero in hex number

Thanks to Russell King for pointing this out

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

Patch from Ben Dooks

Added missing exports of the functions in gpio.c

Thanks to Dimitry Andric for pointing this out

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

These are no longer necessary since MMC support is now merged.

Patch from Catalin Marinas

Versatile/AB code after splitting core.c
Versatile/PB code after splitting core.c

Patch from Catalin Marinas

Common changes for Versatile PB and AB

Patch from Catalin Marinas

Add ICS307 clock support

Accessing register index -1 causes vfp_get_double() to enter an
infinite loop.  Use VFP_REG_ZERO (value 16) and provide code to
emulate a sixteenth register which always returns 0.0

Patch from Nicolas Pitre

Fold two tests in one.

Signed-off-by: Nicolas Pitre 
Signed-off-by: Russell King

Patch from Ben Dooks

This fixes the following with s3c24xx power management:

- debugging needs UARTs enabled, to re-enabled UART clocks,
  save their state over suspend, and add this to the current
  documentation

- update the documentation on pm initialisation

- fix bug reported by Dimitry Andric where __raw_writel()
  has arguments the wrong way around

- fix typo (lower-case letter in S3C2410_GATSTUs2_OFFRESET)
  from Dimitry Andric

- apply Arnaud Patard's patch for pm call types

- move bits of resume code to use printk(KERN_DEBUG) as they
  are potentially before the UART resume, and are not critical
  if the system fails to re-start.

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

Patch from John Lenz

Similar to sa1111.c, convert the locomo_probe function to use
the platform_get_resource\platform_get_irq instead of accessing
the pdev->resources array directly.

Patch from Peter Chubb

Fix a simple typo.

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre 
Signed-off-by: Russell King

Patch from Ben Dooks

Make addr_reg an `void __iomem *` instead of an unsigned long.

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

Patch from Ben Dooks

Fix incorrect bit masking of the wake maskes for 
IRQs EINT0 through EINT3 and IRQ_RTC

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

Patch from Matthias Burghardt

In ssp_init dev->port is not yet initialized. Thus it cannot be used as an argument for request_mem_region. This patch fixes that.

Patch from Matthias Burghardt

Adds bit definitions for PXA Power Manager Wake-Up Enable Register (PWER) to pxa-regs.h

Signed-off-by: Matthias Burghardt
Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Add CONFIG_CPU_CACHE_VIVT and CONFIG_CPU_CACHE_VIPT and use
these to conditionalise cache_is_xxx().  This allows unnecessary
cache handling code to be removed by the compiler.

The __iomem attribute was correctly set, and trying to
remove it just causes more problems.

Too much cut-and-paste, hidden by the fact that without debugging,
"dev_dbg()" doesn't even look at its arguments.

It apparently really confuses some things (Apple keyboard
internal hub for one, but possibly others).

	This tiny bit of the last WE-17 patch was lost between me and
you. I initially decided to wait to resubmit, but Chris Wedgwood
reported that the MadWifi driver needs it. Sorry for not having pushed
harder.
	I recreated this patch, and tested with 2.6.10-rc1, and Chris
tested it with MadWifi. Would you mind pushing that up to Linus ?

Changelog :
	o remove unneeded const
	o spelling + comments
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Experimented a bit more with mounting a bad ext2 filesystem.

An immediate crash was caused by zero EXT2_BLOCKS_PER_GROUP(sb).
The patch below (relative to 2.6.9) adds a few checks to make sure
that things we divide by are not zero.

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

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

On Thu, Nov 04, 2004 at 12:52:38PM -0800, Greg KH wrote:
> Hi,
>
> I get the following BUG in the sysfs code when I do:
> 	- plug in a usb-serial device.
> 	- open the port with 'cat /dev/ttyUSB0'
> 	- unplug the device.
> 	- stop the 'cat' process with control-C
>
> This used to work just fine before your big sysfs changes.

There is a similar problem reported by s390 people where we see parent
kobject (directory) going away before child kobject (sub-directory). It
seems kobject code is able to handle this, but not the sysfs. What could
be happening that in sysfs_remove_dir() of parent directory, we try to
remove its contents. It works well with the regular files as it is the
final removal for sysfs_dirent corresponding to the files. But in case
of sub-directory we are doing an extra sysfs_put().  Once while removing
parent and the other one being the one from when sysfs_remove_dir() is
called for the child.

The following patch worked for the s390 people, I hope same will work in
this case also.


o Do not remove sysfs_dirents corresponding to the sub-directory in
  sysfs_remove_dir(). They will be removed in the sysfs_remove_dir() call
  for the specific sub-directory.
Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The spin_unlock() in rotate_reclaimable_page() is not a sufficient memory
barrier.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>