korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 02:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
d0a0c28cf1
linux/arch/arm/mach-ux500
History
Linus Torvalds dcded10f6d Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (30 commits)
  DMAENGINE: at_hdmac: locking fixlet
  DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l
  dma: dmatest: fix potential sign bug
  ioat2: catch and recover from broken vtd configurations v6
  DMAENGINE: add runtime slave control to COH 901 318 v3
  DMAENGINE: add runtime slave config to DMA40 v3
  DMAENGINE: generic slave channel control v3
  dmaengine: Driver for Topcliff PCH DMA controller
  intel_mid: Add Mrst & Mfld DMA Drivers
  drivers/dma: Eliminate a NULL pointer dereference
  dma/timb_dma: compile warning on 32 bit
  DMAENGINE: ste_dma40: support older silicon
  DMAENGINE: ste_dma40: support disabling physical channels
  DMAENGINE: ste_dma40: no disabled phy channels on ux500
  DMAENGINE: ste_dma40: fix suspend bug
  DMAENGINE: ste_dma40: add DB8500 memcpy channels
  DMAENGINE: ste_dma40: no flow control on memcpy
  DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
  DMAENGINE: ste_dma40: allocate LCLA dynamically
  DMAENGINE: ste_dma40: no premature stop
  ...

Fix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c
2010-08-09 21:00:07 -07:00
..
include/mach Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-08-09 21:00:07 -07:00
board-mop500.c ARM: 6267/1: mop500: add AB8500 interrupt support 2010-07-27 08:28:32 +01:00
board-u5500.c ARM: 6090/1: ux500: add U5500 support 2010-05-04 17:50:06 +01:00
clock.c ARM: AMBA: Add pclk definition for platforms using primecells 2010-07-22 09:55:38 +01:00
clock.h ARM: 6145/1: ux500 MTU clockrate correction 2010-05-27 10:36:08 +01:00
cpu-db5500.c ARM: 6184/2: ux500: use neutral PRCMU base 2010-07-09 14:46:47 +01:00
cpu-db8500.c DMAENGINE: DMA40 U8500 platform configuration 2010-05-27 15:21:26 -07:00
cpu.c ARM: 6145/1: ux500 MTU clockrate correction 2010-05-27 10:36:08 +01:00
devices-db5500.c ARM: 6090/1: ux500: add U5500 support 2010-05-04 17:50:06 +01:00
devices-db8500.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-08-09 21:00:07 -07:00
devices.c ARM: 6085/1: ux500: reorganize i2c devices 2010-05-04 17:50:04 +01:00
headsmp.S ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
Kconfig ARM: 6090/1: ux500: add U5500 support 2010-05-04 17:50:06 +01:00
localtimer.c ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
Makefile ARM: 6152/1: ux500 make it possible to disable localtimers 2010-06-08 19:25:49 +01:00
Makefile.boot ARM: 5832/1: ARM: U8500 Makefile.boot 2009-11-28 10:22:52 +00:00
pins-db8500.h ARM: 6160/1: ux500: add DB8500 pin configs 2010-06-16 22:30:48 +01:00
platsmp.c ARM: 6088/1: ux500: use UX500_* macros instead of U8500_* 2010-05-04 17:50:05 +01:00
ste-dma40-db8500.h DMAENGINE: ste_dma40: add DB8500 memcpy channels 2010-06-22 18:01:56 -07:00