linux_old1/arch/arm/mach-u300/include/mach
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
clkdev.h [ARM] 5474/1: U300 clocking framework 2009-04-28 22:44:12 +01:00
coh901318.h mach-u300: define a dummy filter function for coh901318 2011-03-14 14:05:17 +01:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma_channels.h ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300 2010-01-27 22:00:15 +00:00
entry-macro.S [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
gpio.h ARM: 6377/1: supply _cansleep gpio function to U300 2010-09-17 10:16:49 +01:00
hardware.h [ARM] 5470/1: U300 register definitions 2009-04-28 22:44:05 +01:00
io.h [ARM] 5470/1: U300 register definitions 2009-04-28 22:44:05 +01:00
irqs.h ARM: AB3550 board configuration and irq for U300 2010-05-28 01:37:47 +02:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
platform.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
syscon.h ARM: 5665/1: U300 syscon register updates 2009-08-15 15:36:28 +01:00
system.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
timex.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
u300-regs.h ARM: platform data to use the FSMC NAND with the U300 2010-10-25 00:35:46 +01:00
uncompress.h [ARM] 5473/1: U300 core machine support 2009-04-28 22:44:15 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00