leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13904fba37
linux/arch/arm/mach-ux500/include/mach
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
..
clkdev.h ARM: 5830/1: ARM: U8500 clock framework 2009-11-28 10:22:52 +00:00
db5500-regs.h ARM: 6078/1: ux500: add per-SoC register definitions 2010-05-04 17:50:01 +01:00
db8500-regs.h DMAENGINE: ste_dma40: support older silicon 2010-06-22 18:06:42 -07:00
debug-macro.S ARM: 6079/1: ux500: allow choice of the DEBUG_LL UART 2010-05-04 17:50:01 +01:00
devices.h DMAENGINE: DMA40 U8500 platform configuration 2010-05-27 15:21:26 -07:00
entry-macro.S ARM: 6088/1: ux500: use UX500_* macros instead of U8500_* 2010-05-04 17:50:05 +01:00
gpio.h ARM: 6081/1: ux500: move gpio macros to common header 2010-05-04 17:50:02 +01:00
hardware.h ARM: 6090/1: ux500: add U5500 support 2010-05-04 17:50:06 +01:00
io.h
irqs-board-mop500.h ARM: 6267/1: mop500: add AB8500 interrupt support 2010-07-27 08:28:32 +01:00
irqs-db5500.h ARM: 6266/1: ux500: add separate irq lists for DB8500 and DB5500 2010-07-26 11:11:21 +01:00
irqs-db8500.h ARM: 6266/1: ux500: add separate irq lists for DB8500 and DB5500 2010-07-26 11:11:21 +01:00
irqs.h ARM: 6267/1: mop500: add AB8500 interrupt support 2010-07-27 08:28:32 +01:00
memory.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
setup.h ARM: 6090/1: ux500: add U5500 support 2010-05-04 17:50:06 +01:00
smp.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
system.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
timex.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
uncompress.h ARM: 6275/1: ux500: don't use writeb() in uncompress.h 2010-07-29 14:04:35 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00