2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 16:46:23 +08:00
linux-next/arch/arm/mach-tcc8k
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
..
board-tcc8000-sdk.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
clock.c arm: tcc8k: Fix bus clock calculation 2011-03-11 10:06:06 +01:00
common.h ARM: Add common platform devices for TCC8xxx SoCs 2010-09-17 21:55:09 +02:00
devices.c ARM: Add common platform devices for TCC8xxx SoCs 2010-09-17 21:55:09 +02:00
io.c ARM: Basic IO mappings for mach-tcc8k 2010-09-17 21:55:08 +02:00
irq.c ARM: tcc8k: irq_data conversion. 2011-01-13 17:19:03 +01:00
Kconfig ARM: Add board support for Telechips TCC8000-SDK board 2010-09-17 21:55:09 +02:00
Makefile ARM: Add board support for Telechips TCC8000-SDK board 2010-09-17 21:55:09 +02:00
Makefile.boot ARM: Add board support for Telechips TCC8000-SDK board 2010-09-17 21:55:09 +02:00
time.c ARM: tcc8k: update clock source registration 2010-12-22 22:44:37 +00:00