linux/arch/sh/kernel
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
..
cpu Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-07-24 17:12:54 -07:00
vsyscall
.gitignore
asm-offsets.c
cpufreq.c
crash_dump.c
debugtraps.S
disassemble.c
dma-nommu.c
dumpstack.c sh64: Convert to unwinder API. 2012-05-24 15:03:46 +09:00
dwarf.c
entry-common.S
ftrace.c
head_32.S
head_64.S
hw_breakpoint.c
idle.c sh: Remove cpu_idle_wait() 2012-05-08 12:35:07 +02:00
io_trapped.c
io.c
iomap.c
ioport.c
irq_32.c
irq_64.c
irq.c sh: Kill off now unused arch_probe_nr_irqs(). 2012-05-24 13:59:35 +09:00
kdebugfs.c
kgdb.c sh: kgdb: Fix up NULL pointer deref by kgdb_nmicallback. 2012-04-10 14:22:39 +09:00
kprobes.c
localtimer.c
machine_kexec.c
machvec.c sh: Kill off machvec IRQ hinting. 2012-05-21 17:54:01 +09:00
Makefile sh: Use generic init_task 2012-05-05 13:00:25 +02:00
module.c
nmi_debug.c
perf_callchain.c
perf_event.c
process_32.c 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
process_64.c sh64: Fix up fallout from generic init_task conversion. 2012-05-24 15:07:47 +09:00
process.c sh: arch/sh/kernel/process.c needs asm/fpu.h for unlazy_fpu(). 2012-05-24 13:03:20 +09:00
ptrace_32.c seccomp: ignore secure_computing return values 2012-04-18 12:24:50 +10:00
ptrace_64.c seccomp: ignore secure_computing return values 2012-04-18 12:24:50 +10:00
ptrace.c
reboot.c
relocate_kernel.S
return_address.c
setup.c
sh_bios.c
sh_ksyms_32.c
sh_ksyms_64.c sh: use the new generic strnlen_user() function 2012-06-13 10:28:37 +09:00
signal_32.c new helper: signal_delivered() 2012-06-01 12:58:52 -04:00
signal_64.c new helper: signal_delivered() 2012-06-01 12:58:52 -04:00
smp.c sh: use clear_tasks_mm_cpumask() 2012-05-31 17:49:30 -07:00
stacktrace.c
swsusp.c
sys_sh32.c
sys_sh64.c
sys_sh.c
syscalls_32.S
syscalls_64.S
time.c
topology.c
traps_32.c sh: Consolidate die definitions for trap handlers. 2012-06-14 14:18:51 +09:00
traps_64.c sh64: Attempt to make reserved insn trap handler resemble C. 2012-06-14 14:46:36 +09:00
traps.c sh: Consolidate die definitions for trap handlers. 2012-06-14 14:18:51 +09:00
unwinder.c
vmlinux.lds.S