into pobox.com:/garz/repo/libata-2.6

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

Include asm/hardware/*.h before asm/arch/*.h
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Nicolas Pitre

A more elegant solution could be applied which would require more work.
However there is only one platform using both chips (Lubbock) and half
of the SA1111 features are unusable due to botched DMA support at the
PCB level anyway.  Therefore this solution should be sufficient for
now.
Also removed the SADIV defines which use would not constitute good
programming practice. Divisors should be computed directly in the code
especially since different PXA2xx versions have different clock source
frequencies.  No in-tree driver uses them so this is low impact..
Finally changed alignment to fit rest of file.

Signed-off-by: Nicolas Pitre
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

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

bart: while at it do whitespace cleanup and add missing FIXME
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

->init_chipset is optional
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

bart: do small whitespace cleanup while at it
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

bart: s/byte/u8/
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

bart: leave BUSCLOCK() alone for now
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>

On Fri, 4 Feb 2005, Al Viro wrote:

> BTW, ide-lib.c code that triggers the ICE happens to be completely broken.
> Jens, it's your patch from September 2002 - what used to be
>        if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
> became
>        if ((status.all & (status.b.bsy|status.b.check)) == status.b.check) {
> and that's *not* an equivalent transformation.  Fixing it doesn't get rid
> of ICE, but it certainly deserves fixing.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Return success if no device is connected to the interface.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Contributed by Peer Chen @ ULi

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

Here is the cleaned up patch (as you suggested) that enables ata_piix
to work in RAID mode on ICH6R.  I tested it and it seems to behave
correctly

in all the modes---sees all 4 disks in IDE and RAID modes, doesn't
see any in Compatibility mode (which is right, because only two are
available and the regular IDE driver has picked them up already).


Change description:  only test for PCI IDE legacy mode, via the
PCI programming interface register, if the PCI device is of class
PCI_CLASS_STORAGE_IDE.
Signed-off-by: Martins Krikis <mkrikis@yahoo.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

The code previously alloced a 2-entry array, then freed each
entry individually, for users of "combined mode".

Convert code to use allocation function that only allocates
one object at a time.

Also, un-export ata_pci_init_legacy_mode(), as its only user is
libata-core.

Also, trim trailing whitespace.

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

Signed-off-by: David S. Miller <davem@davemloft.net>

In light of the recent discussion about sk_buff, I think we need
the following patch for dst_entry.  This adds a memory barrier
before dst_release drops the refcnt, and a read memory barrier
before dst_destroy starts destroying the entry.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Also kill kfree_skb_fast(), that is a relic from fast switching
which was killed off years ago.

The bug is that in the case where we do the atomic_read()
optimization, we need to make sure that reads of skb state
later in __kfree_skb() processing (particularly the skb->list
BUG check) are not reordered to occur before the counter
read by the cpu.

Thanks to Olaf Kirch and Anton Blanchard for discovering
and helping fix this bug.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>