system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-28 15:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
linux/arch/arm/mach-s5pv210
History
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 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
clock.c Merge branch 'dev/cleanup-clocks' into for-next 2011-01-05 09:39:23 +09:00
cpu.c ARM: S5P: Move SROM controller IO mapping to plat-s5p for S5P SoCs 2010-12-30 09:37:48 +09:00
cpufreq.c [CPUFREQ] Remove the pm_message_t argument from driver suspend 2011-03-16 17:54:33 -04:00
dev-audio.c ASoC: Samsung: Rename AC97 platform device 2010-11-23 14:05:29 +00:00
dev-spi.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
dma.c ARM: S5P: Reorder DMA platform device id 2010-10-25 16:10:47 +09:00
gpiolib.c ARM: S5P: Add function to register gpio interrupt bank data 2011-03-15 21:17:43 +09:00
init.c
Kconfig ARM: S5P: Update defconfig for HRT support 2011-03-12 08:05:19 +09:00
mach-aquila.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
mach-goni.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
mach-smdkc110.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
mach-smdkv210.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
mach-torbreck.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
Makefile ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
Makefile.boot
pm.c ARM: S5PV210: Add Power Management Support 2010-10-21 07:54:57 +09:00
setup-fb-24bpp.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-fimc.c ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
setup-i2c0.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c1.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c2.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-ide.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-keypad.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-sdhci-gpio.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-sdhci.c ARM: S5PV210: cleanup hsmmc clock definitions 2010-08-05 18:36:22 +09:00
sleep.S ARM: pm: convert samsung platforms to generic suspend/resume support 2011-02-22 17:11:25 +00:00