Linus Torvalds ca41cc96b2 Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping ... Pull CMA and DMA-mapping updates from Marek Szyprowski: "This time the pull request is rather small, because the further redesign patches were not ready on time. This pull request consists of the patches which extend ARM DMA-mapping subsystem with support for CPU coherent (ACP) DMA busses. The first client of the new version is HighBank SATA driver. The second part of the pull request includes various cleanup for both CMA common code and ARM DMA-mapping subsystem." Fix up trivial add-add conflict due to the "dma-coherent" DT property being added next to the "calxeda,port-phys" property for the Calxeda AHCI controller. * 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page ARM: highbank: add coherent DMA setup ARM: kill off arch_is_coherent ARM: add coherent iommu dma ops ARM: add coherent dma ops ARM: dma-mapping: Refrain noisy console message ARM: dma-mapping: Small logical clean up drivers: dma-contiguous: refactor dma_alloc_from_contiguous()		2012-10-02 19:13:12 -07:00
..
power	Power management updates for 3.7-rc1	2012-10-02 18:32:35 -07:00
regmap	Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next	2012-09-22 12:02:05 -04:00
attribute_container.c
base.h
bus.c	driver core: move uevent call to driver_register	2012-07-16 18:04:25 -07:00
class.c	Revert "driver core: check start node in klist_iter_init_node"	2012-04-19 19:17:30 -07:00
core.c	device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit	2012-09-17 06:10:05 -07:00
cpu.c	sched: Remove stale power aware scheduling remnants and dysfunctional knobs	2012-05-17 13:48:56 +02:00
dd.c	[SCSI] cleanup usages of scsi_complete_async_scans	2012-07-20 09:25:22 +01:00
devres.c	driver core: devres: introduce devres_for_each_res	2012-08-16 13:30:29 -07:00
devtmpfs.c	userns: Convert devtmpfs to use GLOBAL_ROOT_UID and GLOBAL_ROOT_GID	2012-09-21 03:13:05 -07:00
dma-buf.c	driver core: fix some kernel-doc warnings in dma*.c	2012-06-14 17:15:26 -07:00
dma-coherent.c	driver core: fix some kernel-doc warnings in dma*.c	2012-06-14 17:15:26 -07:00
dma-contiguous.c	drivers: dma-contiguous: refactor dma_alloc_from_contiguous()	2012-10-02 08:57:45 +02:00
dma-mapping.c	common: dma-mapping: introduce dma_get_sgtable() function	2012-07-30 12:25:46 +02:00
driver.c	driver core: don't trigger uevent after failure	2012-07-17 10:40:23 -07:00
firmware_class.c	firmware loader: fix compile warning when CONFIG_PM=n	2012-09-10 16:40:30 -07:00
firmware.c
hypervisor.c
init.c
isa.c
Kconfig	mm: factor out memory isolate functions	2012-07-31 18:42:45 -07:00
Makefile	drivers: add Contiguous Memory Allocator	2012-05-21 15:09:37 +02:00
map.c
memory.c
module.c
node.c	mm: fix off-by-one bug in print_nodes_state()	2012-05-29 16:22:19 -07:00
platform.c	Power management updates for 3.7-rc1	2012-10-02 18:32:35 -07:00
soc.c	mode_t whack-a-mole: ->is_visible() returns umode_t...	2012-05-29 23:28:42 -04:00
syscore.c
topology.c
transport_class.c