From: Linus Torvalds Date: Tue, 24 Jul 2012 02:10:54 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile X-Git-Tag: MMI-PSA29.97-13-9~16306 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0a08fcb5972167e55faa330c4a24fbaa3328b1f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge git://git./linux/kernel/git/cmetcalf/linux-tile Pull arch/tile updates from Chris Metcalf: "These changes provide support for PCIe root complex and USB host mode for tilegx's on-chip I/Os. In addition, this pull provides the required underpinning for the on-chip networking support that was pulled into 3.5. The changes have all been through LKML (with several rounds for PCIe RC) and on linux-next." * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: updates to pci root complex from community feedback bounce: allow use of bounce pool via config option usb: add host support for the tilegx architecture arch/tile: provide kernel support for the tilegx USB shim tile pci: enable IOMMU to support DMA for legacy devices arch/tile: enable ZONE_DMA for tilegx tilegx pci: support I/O to arbitrarily-cached pages tile: remove unused header arch/tile: tilegx PCI root complex support arch/tile: provide kernel support for the tilegx TRIO shim arch/tile: break out the "csum a long" function to arch/tile: provide kernel support for the tilegx mPIPE shim arch/tile: common DMA code for the GXIO IORPC subsystem arch/tile: support MMIO-based readb/writeb etc. arch/tile: introduce GXIO IORPC framework for tilegx --- f0a08fcb5972167e55faa330c4a24fbaa3328b1f