Patch from Tony Lindgren

This patch adds support for 32k timer on OMAP 16xx, and 64-bit
sched clock to the MPU timer.
This is an update version of ARM patch 2337/1. The 32k timer
modulo code has been left out, and the dynamic tick (VST) timer
will be submitted in a separate patch.

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

Oops, it broke.  Glue the bits back together, replacing yrs with
tm->tm_year + 1900.

I will not merge untested changes into Linus' tree.
I will not merge untested changes into Linus' tree.
I will not merge untested changes into Linus' tree.
I will not ...
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Richard Purdie

Sharp SCOOP: Devices with multiple scoop interfaces are now
available so:
* add support for mutliple device support to the driver
* Update corgi, collie and poodle to share the scoop
  device structure so a device can be selected in drivers
* Update drivers to use the device structures

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

Patch from Lennert Buytenhek

Another round of ixp2000 typo fixes.

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King

Patch from Ben Dooks

Add the Acer N30 machine, from Christer Weinigel

Signed-off-by: Christer Weinigel

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

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

This gets the stallion driver working again non-SMP. Patch by Wayne
Meissner
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sorry forgot I made these constants

PWC has a new maintainer (Luc Saillard) and also the various contentious
binary hooks removed and replaced with reverse engineering work.

Please restore it to the kernel

Alan
Signed-off-by: Luc Saillard <luc@saillard.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patch-by: ARTOP Corp.

Basically this adds the small bits for the new card and makes one set of items
an array because the new card is multi-channel.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The current driver does workarounds for errata that do not work with
fibre attached devices. This patch avoids doing the workaround on the
only known fibre attach pcnet/32 hardware. All handling is automated on
pci sub-ids

Patch by: Guido Guenther
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Support sparse
 - Use CONFIG_64BIT instead of CONFIG_PARISC64
 - Find palo in /sbin even if it's not in our $PATH
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Use def_bool where possible
 - Eliminate PARISC64
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Fix all ioremap abuse noticed by CONFIG_DEBUG_IOREMAP on an N4000.
 - F_EXTEND doesn't do what I thought it did on a 32-bit box.
 - New calling convention for txn_alloc_irq()
 - Replace CONFIG_PARISC64 with CONFIG_64BIT
 - Ensure alignment of the irt buffer to 8 bytes even when slab debugging
   is enabled
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - The pdc_io_reset_devices() call necessary for USB keyboard kills the
   serial console.  Use a test that seems to work for both.
 - Don't bounce >4G buffers on machines with IOMMU
 - Remove ASSERT code and cleanup iomem * related warnings
 - Fix comment that was pointing to the old file location
 - Expand comment about PDC reset to describe broken GFX+USB console at
   powerup by direct linux to serial console
 - Fix all ioremap abuse noticed by CONFIG_DEBUG_IOREMAP on an N4000
 - Remove casts from "READ_REG" and "WRITE_REG" macro
 - Set D4 and DD bits in IOC_CTRL
 - Allow all memory in machine to be in-flight DMA at once, up to 4GB
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Use CONFIG_64BIT instead of CONFIG_PARISC64
 - Rename lba_cfg_ops to elroy_cfg_ops
 - Don't check for a non-1,2 or 4 size in the cfg_ops
 - Call LBA_CFG_ADDR_SETUP instead of LBA_CFG_TR4_ADDR_SETUP in elroy_cfg_ops
 - Don't read back from LBA_PCI_CFG_ADDR in LBA_CFG_TR4_ADDR_SETUP
 - Remove LBA_FLAG_NO_DMA_DURING_CFG since it's always set for elroy_cfg_ops
 - Remove LBA_TR4PLUS since we no longer need to test for it.
 - Inline lba_common_init() into lba_driver_probe()
 - Move TR2.1 check into an elroy-only path
 - Check for LBAs that aren't Elroy, Mercury or Quicksilver.
 - Remove all casts to 'int' in the driver, got rid of some unnecessary parens
   and deleted the obsolete part of a comment.
 - Return -EINVAL for config space >255
 - Always return 0 on config read success
 - Remove definitions of TRUE and FALSE
 - ioremap fix for port-io on non-PAT machines
 - Remove the bad casts from the register accessors
 - With those gone, I could see the piop_base needed to be remapped.
 - Fix all ioremap abuse noticed by CONFIG_DEBUG_IOREMAP on an N4000.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Update a500_defconfig
Remove n4000_defconfig as a500_defconfig is now suitable for both boxes
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ALSA Harmony rewrite
Signed-Off-By: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Stuart Brady <sdbrady@ntlworld.com>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add PDC stable storage driver.  Also reorganise PA-RISC Kconfig a little.
Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

PA-RISC firmware needs a hwpath which can be constructed from a pci_dev
or a parisc_device.  Previously we've known what type of device we had,
but when using sysfs we have to figure it out.
Signed-off-by: Thibaut VARENE <varenet@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

More CONFIG_PARISC64 to CONFIG_64BIT conversion
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Move include/asm/parport_gsc.h to drivers/parport/
 - Fix gcc 3.4 compilation (redefined extern inline functions are not
   considered for inlining)

From: Joel Soete <joel.soete@tiscali.be>
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Performance improvement to __clear_user_page_asm
 - White space cleanup
 - 64-bit version of copy_user_page_asm
 - Add prefetching to copy_user_page_asm
 - remove NOP and "bundle" comments

Contributions from Joel Soete
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

Here's a trivial patch to get rid of a redundant check that I added
in patch 3/4.  dst_release already checks for dst == NULL.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Here is a patch that replaces all occurrences of dst_pmtu in the TCP
stack.  As a result we no longer need ext2_header_len.

This has a nice synergetic effect with Arnaldo's latest change to
linux/tcp.h :)

I'll be removing other users of dst->path/dst_pmtu next.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

There is another bug in xfrm_bundle_ok where I forgot to
check the validity of xdst->route.  In fact, the check
on dst->path isn't strong enough either.  For IPv6 entries,
dst->path->obsolete is always negative until you call
ipv6_dst_check.  So we really need to do that here.

Here's the patch to fix those two problems.  Yes I know
my dst_check implementation is lame.  I'll come back and
fix up all the dst_check functions by moving their dst_release
calls out.  It proves that you were right in that IPv6 dst
leak thread :)
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

into pobox.com:/garz/repo/libata-dev/remove-one-fix

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

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

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

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

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

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