OpenCloudOS-Kernel/arch/sh/kernel/cpu
Linus Torvalds c7a19c795b Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma updates from Vinod Koul:
 "Some notable changes are:
   - new driver for AMBA AXI NBPF by Guennadi
   - new driver for sun6i controller by Maxime
   - pl330 drivers fixes from Lar's
   - sh-dma updates and fixes from Laurent, Geert and Kuninori
   - Documentation updates from Geert
   - drivers fixes and updates spread over dw, edma, freescale, mpc512x
     etc.."

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (72 commits)
  dmaengine: sun6i: depends on RESET_CONTROLLER
  dma: at_hdmac: fix invalid remaining bytes detection
  dmaengine: nbpfaxi: don't build this driver where it cannot be used
  dmaengine: nbpf_error_get_channel() can be static
  dma: pl08x: Use correct specifier for size_t values
  dmaengine: Remove the context argument to the prep_dma_cyclic operation
  dmaengine: nbpfaxi: convert to tasklet
  dmaengine: nbpfaxi: fix a theoretical race
  dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores
  dmaengine: add device tree binding documentation for the nbpfaxi driver
  dmaengine: edma: Do not register second device when booted with DT
  dmaengine: edma: Do not change the error code returned from edma_alloc_slot
  dmaengine: rcar-dmac: Add device tree bindings documentation
  dmaengine: shdma: Allocate cyclic sg list dynamically
  dmaengine: shdma: Make channel filter ignore unrelated devices
  dmaengine: sh: Rework Kconfig and Makefile
  dmaengine: sun6i: Fix memory leaks
  dmaengine: sun6i: Free the interrupt before killing the tasklet
  dmaengine: sun6i: Remove switch statement from buswidth convertion routine
  dmaengine: of: kconfig: select DMA_ENGINE when DMA_OF is selected
  ...
2014-08-11 07:14:01 -07:00
..
irq Disintegrate asm/system.h for SH 2012-03-28 18:30:03 +01:00
sh2 sh: Switch to new style CMT device 2014-05-11 19:35:26 +09:00
sh2a sh: Switch to new style MTU2 device 2014-05-11 19:35:28 +09:00
sh3 sh: Switch to new style TMU device 2014-05-11 19:35:27 +09:00
sh4 sh: Switch to new style TMU device 2014-05-11 19:35:27 +09:00
sh4a Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma 2014-08-11 07:14:01 -07:00
sh5 sh: Switch to new style TMU device 2014-05-11 19:35:27 +09:00
shmobile SH: cpuidle: Add missing parameter for cpuidle_register() 2013-08-12 11:28:18 +02:00
Makefile sh: Add PFC platform device registration helper function 2013-01-25 09:24:23 +09:00
adc.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
clock-cpg.c sh: Switch to new style MTU2 device 2014-05-11 19:35:28 +09:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
fpu.c sh: move fpu_counter into ARCH specific thread_struct 2013-11-13 12:09:13 +09:00
init.c sh: prefix sh-specific "CCR" and "CCR2" by "SH_" 2014-03-04 07:55:49 -08:00
pfc.c sh: Remove unused sh_pfc_register_info() function 2013-01-25 09:24:30 +09:00
proc.c Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest 2012-05-10 17:20:56 +09:00