Linus Torvalds c511dc1fb6 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Pull slave-dmaengine update from Vinod Koul: "This time we have a new dmaengine driver from the tegra folks. Also we have Guennadi's cleanup of sh drivers which incudes a library for sh drivers. And the usual odd fixes in bunch of drivers and some nice cleanup of dw_dmac from Andy." Fix up conflicts in drivers/mmc/host/sh_mmcif.c * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits) dmaengine: Cleanup logging messages mmc: sh_mmcif: switch to the new DMA channel allocation and configuration dma: sh: provide a migration path for slave drivers to stop using .private dma: sh: use an integer slave ID to improve API compatibility dmaengine: shdma: prepare to stop using struct dma_chan::private sh: remove unused DMA device pointer from SIU platform data ASoC: siu: don't use DMA device for channel filtering dmaengine: shdma: (cosmetic) simplify a static function dmaengine: at_hdmac: add a few const qualifiers dw_dmac: use 'u32' for LLI structure members, not dma_addr_t dw_dmac: mark dwc_dump_lli inline dma: mxs-dma: Export missing symbols from mxs-dma.c dma: shdma: convert to the shdma base library ASoC: fsi: prepare for conversion to the shdma base library usb: renesas_usbhs: prepare for conversion to the shdma base library ASoC: siu: prepare for conversion to the shdma base library serial: sh-sci: prepare for conversion to the shdma base library mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion dma: shdma: prepare for conversion to the shdma base library ...		2012-07-24 17:12:54 -07:00
..
adc.h
addrspace.h	sh: nommu: use 32-bit phys mode.	2010-11-04 12:32:24 +09:00
alignment.h
asm-offsets.h
atomic-grb.h
atomic-irq.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
atomic-llsc.h
atomic.h	sh: Fix up tracepoint build fallout from static key introduction.	2012-04-27 11:12:38 +09:30
auxvec.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
barrier.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
bitops-grb.h
bitops-llsc.h
bitops-op32.h
bitops.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
bl_bit_32.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
bl_bit_64.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
bl_bit.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
bug.h	sh: Consolidate die definitions for trap handlers.	2012-06-14 14:18:51 +09:00
bugs.h
byteorder.h
cache_insns_32.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
cache_insns_64.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
cache_insns.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
cache.h	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
cachectl.h
cacheflush.h	sh: Assume new page cache pages have dirty dcache lines.	2010-12-01 15:39:51 +09:00
checksum_32.h
checksum.h
clkdev.h	ARM: 6483/1: arm & sh: factorised duplicated clkdev.c	2010-11-26 10:51:04 +00:00
clock.h	sh: sh header sh_clk_ops rename	2012-03-12 22:19:10 +01:00
cmpxchg-grb.h	sh: Fix up xchg/cmpxchg corruption with gUSA RB.	2011-06-08 15:22:39 +09:00
cmpxchg-irq.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
cmpxchg-llsc.h
cmpxchg.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
cpu-features.h
device.h	sh: Defer to asm-generic/device.h.	2012-01-13 16:27:38 +09:00
dma-mapping.h	SH: adapt for dma_map_ops changes	2012-03-28 16:36:37 +02:00
dma-register.h	dmaengine: shdma: separate DMA headers.	2010-03-02 11:09:04 +09:00
dma.h	sh: Kill off MAX_DMA_ADDRESS leftovers.	2012-05-19 18:50:09 +09:00
dmabrg.h
dwarf.h
elf.h	sh: update the FDPIC relocations.	2010-06-14 18:02:13 +09:00
entry-macros.S
exec.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
fb.h
fixmap.h	Revert "sh: Ensure fixmap and store queue space can co-exist."	2012-05-18 19:30:05 +09:00
flat.h
fpu.h
freq.h
ftrace.h
futex-irq.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
futex.h	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
gpio.h	sh: Allow GPIO chips to register IRQ mappings.	2010-10-03 03:55:39 +09:00
hardirq.h
hd64461.h
heartbeat.h
hugetlb.h
hw_breakpoint.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-05-19 11:36:03 -07:00
hw_irq.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
i2c-sh7760.h	sh: edosk7760 evt2irq migration.	2012-05-18 14:52:31 +09:00
io_generic.h	sh: machvec IO death.	2010-11-01 09:49:04 -04:00
io_noioport.h	SH: Convert out[bwl] macros to inline functions	2012-07-12 13:12:13 +09:00
io_trapped.h
io.h	sh: Provide stubbed I/O routines for NO_IOPORT case.	2012-05-10 13:07:55 +09:00
ioctls.h	tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys	2011-02-17 14:16:30 -08:00
irq.h	sh: Kill off machvec IRQ hinting.	2012-05-21 17:54:01 +09:00
irqflags.h	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
Kbuild	sh: Kill off additional asm-generic wrappers.	2012-06-13 11:59:47 +09:00
kdebug.h	sh64: Convert to unwinder API.	2012-05-24 15:03:46 +09:00
kexec.h	sh: convert kexec crash kernel management to LMB.	2010-05-07 14:54:55 +09:00
kgdb.h	sh: kgdb: Unset CACHE_FLUSH_IS_SAFE for SMP.	2012-04-11 10:48:24 +09:00
kmap_types.h
kprobes.h	sh: Add kprobe-based event tracer.	2010-06-14 15:16:53 +09:00
linkage.h
machvec.h	sh: Kill off machvec IRQ hinting.	2012-05-21 17:54:01 +09:00
mc146818rtc.h
mmu_context_32.h
mmu_context_64.h
mmu_context.h
mmu.h	sh: Fix up NUMA build for 29-bit.	2010-03-10 16:29:48 +09:00
mmzone.h	Fix node_start/end_pfn() definition for mm/page_cgroup.c	2011-06-27 14:13:09 -07:00
module.h
mutex-llsc.h
mutex.h
page.h	sh: Fix cached/uncaced address calculation in 29bit mode	2011-11-04 22:13:50 +09:00
pci.h	PCI: collapse pcibios_resource_to_bus	2012-02-23 20:19:04 -07:00
perf_event.h	irq_work: Add generic hardirq context callbacks	2010-10-18 19:58:50 +02:00
pgalloc.h
pgtable_32.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
pgtable_64.h	sh64: Kill off unused fixed I/O mapping window.	2012-05-14 15:16:11 +09:00
pgtable-2level.h
pgtable-3level.h
pgtable.h	sh64: asm/pgtable.h needs asm/mmu.h	2011-05-31 14:37:44 +09:00
posix_types_32.h	bury __kernel_nlink_t, make internal nlink_t consistent	2012-05-30 21:04:50 -04:00
posix_types_64.h	bury __kernel_nlink_t, make internal nlink_t consistent	2012-05-30 21:04:50 -04:00
posix_types.h
processor_32.h	fork: move the real prepare_to_copy() users to arch_dup_task_struct()	2012-05-16 15:16:26 -07:00
processor_64.h	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-23 10:59:07 -07:00
processor.h	SuperH updates for 3.5-rc1 merge window	2012-05-23 09:00:40 -07:00
ptrace_32.h	Audit: push audit success and retcode into arch ptrace.h	2012-01-17 16:16:56 -05:00
ptrace_64.h	Audit: push audit success and retcode into arch ptrace.h	2012-01-17 16:16:56 -05:00
ptrace.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
push-switch.h
reboot.h
romimage-macros.h
rtc.h
rwsem.h	rwsem: Move duplicate function prototypes to linux/rwsem.h	2011-01-27 12:30:39 +01:00
seccomp.h
sections.h	sh: Change __nosave_XXX symbols to long	2011-02-15 16:24:54 +09:00
segment.h
setup.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
sfp-machine.h
sh7760fb.h
sh_bios.h
shmparam.h
sigcontext.h
signal.h
siu.h	sh: remove unused DMA device pointer from SIU platform data	2012-07-20 11:23:44 +05:30
smc37c93x.h
smp-ops.h	sh: CPU hotplug support.	2010-04-26 19:08:55 +09:00
smp.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
sockios.h
sparsemem.h
spi.h
spinlock_types.h
spinlock.h
sram.h	sh: Provide a generic SRAM pool for tiny memories.	2010-10-15 02:09:00 +09:00
stackprotector.h	sh: initial stack protector support.	2012-04-19 15:45:57 +09:00
stacktrace.h	sh: remove warning and warning_symbol from struct stacktrace_ops	2011-05-23 14:42:15 +09:00
stat.h
string_32.h
string_64.h
string.h
suspend.h	PM / Hibernate: Remove arch_prepare_suspend()	2011-05-24 23:35:55 +02:00
swab.h
switch_to_32.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
switch_to_64.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
switch_to.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
syscall_32.h
syscall_64.h
syscall.h
syscalls_32.h	sh: switch to saved_sigmask-based sigsuspend()/rt_sigsuspend()	2012-05-21 23:58:06 -04:00
syscalls_64.h	Mark arguments to certain syscalls as being const	2010-08-13 16:53:13 -07:00
syscalls.h	Add generic sys_olduname()	2010-03-12 15:52:32 -08:00
thread_info.h	set_restore_sigmask() is never called without SIGPENDING (and never should be)	2012-06-01 12:58:50 -04:00
timex.h
tlb_64.h
tlb.h	sh: asm/tlb.h needs linux/swap.h	2011-05-31 13:27:41 +09:00
tlbflush.h	sh: Provide a global TLB flush for U/I-TLB clear.	2010-07-02 15:44:09 +09:00
topology.h	sched/numa: Rewrite the CONFIG_NUMA sched domain support	2012-05-09 15:00:55 +02:00
traps_32.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
traps_64.h	sh64: Provide EXPEVT helper.	2012-05-14 13:04:08 +09:00
traps.h	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
types.h
uaccess_32.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00
uaccess_64.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00
uaccess.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00
unaligned-sh4a.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
unaligned.h
uncached.h	sh: nommu: Support building without an uncached mapping.	2010-11-04 12:46:19 +09:00
unistd_32.h	sh: Consolidate duplicate _32/_64 unistd definitions.	2012-03-28 17:10:05 +09:00
unistd_64.h	sh: Consolidate duplicate _32/_64 unistd definitions.	2012-03-28 17:10:05 +09:00
unistd.h	sh: switch to saved_sigmask-based sigsuspend()/rt_sigsuspend()	2012-05-21 23:58:06 -04:00
unwinder.h
user.h
vga.h
vmlinux.lds.h
watchdog.h
word-at-a-time.h	sh: use the new generic strnlen_user() function	2012-06-13 10:28:37 +09:00