From: Stefan Dirsch <sndirsch@suse.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>

into starflyer.(none):/foo/airlied/bitkeeper/drm-latest

into bkbits.net:/repos/d/drm/drm-2.6

get_user() stores result in a local variable that later gets cast to
integer or pointer type.  The proper type for that is unsigned long. 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from George G. Davis

Adds support for Thumb ld/st alignment fault fixups via conversion of
Thumb ld/st instruction forms into equivalent ARM instructions and
reusing ARM alignment fault handler for Thumb instructions. This
implementation was inspired by and initially based on the algorithm
found in gdb/sim/arm/thumbemu.c.

I've backed out the silly 'T' suffix on PC in this version as requested
by RMK. At this point, I prefer to avoid making any of the other changes
discussed, e.g. dump_instr() for bad instruction cases, in order to get
the basic Thumb support change committed.

Thanks!

Signed-off-by: George G. Davis
Signed-off-by: Russell King

Patch from Tony Lindgren

This patch syncs the mainline kernel with the linux-omap tree.
The highlights of the patch are:
- Add OMAP board specific low-level init functions for smc91x Ethernet
- DMA audio functions by Nishant Menon
- Remove references to OMAP specific serial.h

This is an updated version of ARM patch 2331/1 with extra comments
added to the omap_get_dma_src_pos() and omap_get_dma_dst_pos() functions
as recommended by RMK.

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

Patch from Tony Lindgren

Updates processor specific Kconfig options for OMAP

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

Patch from Tony Lindgren

ARM Kconfig updates for OMAP leds

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

Patch from Deepak Saxena

This patch fixes two issues with the IXP2000 timer implementation:

- We currently to not account for lost timer interrupts
- We currently do not check for rollover within gettimeoffset()

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

Patch from Deepak Saxena

On IXDP2801 we need to write a magic sequence to the CPLD to ensure
a full system reset instead of just CPU reset. Also cleanup some
comments and copyrights while we are in here.

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

Patch from George G. Davis

Convert ARM proc files to use manifest constants defined in pgtable.h
and domain.h. This is a prelude to allow renumbering domains. The
domain renumbering is required to implement support for ARMv6 MMU
super sections where domain 0 is implied. Although this is technically
only required for ARMv6, it seemed reasonable to clean up all proc
files while here.

I did a test build with and without this patch applied and confirmed
that all proc file binaries are unchanged when this patch is applied.

Signed-off-by: George G. Davis
Signed-off-by: Russell King

Patch from Tony Lindgren

This patch syncs the mainline kernel with the linux-omap tree.
The patch mostly contains minor fixes and extra register definitions
by various OMAP developers.

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

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

->cfg_addr is an iomem pointer; annotated as such, setup_indirect_pci()
cleaned up. 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

gg2_pci_config_base is an iomem pointer.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

struct pci_controller ->cfg_data annotated as iomem pointer; users
modified accordingly... 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

size_t is %zd, not %d...
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

should include asm/irq.h, not linux/irq.h
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

switch to ioremap + normal iomem access primitives
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 * prototypes converted to standard ones
 * bunch of useless casts killed in ioread*/iowrite*
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

x86-64 memcpy_toio(), memcpy_fromio(), memset_io() and read{b,w,l,q}(),
switched to standard prototypes. 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

__user annotations in new code.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 a) __user annotations
 b) NULL noise removals
 c) added missing ifdef CONFIG_PCI around the loop over mxser_pcibrds
    during init.
 d) declaration of CMSPAR in case if it had been undefined moved up
    prior to the first use
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Repairs the breakage introduced in gcc4 fixes.  Original had expanded
to

	((struct zatm_dev *)(dev)->dev_data) = zatm_dev;

and that's what gcc4 had complained about (cast-as-lvalue).  Proper fix is,
of course,

	dev->dev_data = zatm_dev;

What we have in 2.6.10 is

	dev = (struct atm_dev *)zatm_dev;

which doesn't cause complaints, but doesn't do anything good (leak + corruption
at the very least).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

kernel-only stuff moved from affs headers in include/linux to
fs/affs/affs.h; includes in fs/affs/*.c sanitized. 

That's the patch that had been ACKed by Roman + move of function-like
macros from amigaffs.h (also ACKed) + removal of ancient #if 0'ed junk
from declaration of affs_inode_info (spotted and suggested by Roman).
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into bkbits.net:/repos/d/drm/drm-2.6

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

into nuts.davemloft.net:/disk1/BK/net-2.6

Add OpenIB maintainers information to MAINTAINERS.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add files to Documentation/infiniband that describe the tree under
/sys/class/infiniband, the IPoIB driver and the userspace MAD access driver.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add the 0x1b ioctl magic number used by ib_umad module to
Documentation/ioctl-number.txt.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add a driver that provides a character special device for each
InfiniBand port.  This device allows userspace to send and receive
MADs via write() and read() (with some control operations implemented
as ioctls).

All operations are 32/64 clean and have been tested with 32-bit
userspace running on a ppc64 kernel.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add functions for handling IPoIB multicast and multiple partitions.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add a driver that implements the (IPoIB) IP-over-InfiniBand protocol.
This is a network device driver of type ARPHRD_INFINIBAND (and
addr_len INFINIBAND_ALEN bytes).

The ARP/ND implementation for this driver is not completely
straightforward, because InfiniBand requires an additional path lookup
be performed (through an IB-specific mechanism) after a remote
hardware address has been resolved.  We are very open to suggestions
of a better way to handle this than the current implementation.

Although IB has a special multicast group join mode intended to
support IP multicast routing (non member join), no means to identify
different multicast styles has yet been determined, so all joins by
the driver are currently full member joins.  We are looking for
guidance in how to solve this.

The IPoIB protocol/encapsulation is described in the Internet-Drafts
  http://www.ietf.org/internet-drafts/draft-ietf-ipoib-architecture-04.txt
  http://www.ietf.org/internet-drafts/draft-ietf-ipoib-ip-over-infiniband-08.txtSigned-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Add ipv6_ib_mc_map() to convert IPv6 multicast addresses to IPoIB
hardware addresses, and add support for autoconfiguration for devices
with type ARPHRD_INFINIBAND.

The mapping for multicast addresses is described in
  http://www.ietf.org/internet-drafts/draft-ietf-ipoib-ip-over-infiniband-08.txtSigned-off-by: Nitin Hande <Nitin.Hande@Sun.Com>
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>