WSL2-Linux-Kernel/arch/arm/mach-s5p64x0
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
..
include/mach Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
Kconfig ARM: S5P: Update defconfig for HRT support 2011-03-12 08:05:19 +09:00
Makefile ARM: S5P64X0: Rename GPIOlib file to gpiolib.c 2010-12-30 09:37:28 +09:00
Makefile.boot
clock-s5p6440.c Merge branch 'dev/cleanup-clocks' into for-next 2011-01-05 09:39:23 +09:00
clock-s5p6450.c Merge branch 'dev/cleanup-clocks' into for-next 2011-01-05 09:39:23 +09:00
clock.c ARM: S5P: Reduce duplicated EPLL control codes 2010-10-25 16:05:56 +09:00
cpu.c ARM: S5P64X0: Bug fix on errors of build with CONFIG_PREEMPT_NONE 2010-10-18 18:33:04 +09:00
dev-audio.c ARM: S5P64X0: Segregate audio devices 2010-12-30 08:24:27 +09:00
dev-spi.c ARM: S5P64X0: Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:20 +09:00
dma.c ARM: S5P: Reorder DMA platform device id 2010-10-25 16:10:47 +09:00
gpiolib.c ARM: S5P64X0: Change GPIOlib initialization to core_initcall 2010-12-30 09:37:28 +09:00
init.c ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
mach-smdk6440.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
mach-smdk6450.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
setup-i2c0.c ARM: S5P64X0: Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:20 +09:00
setup-i2c1.c ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:53 +09:00