korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 16:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
984e8486c1
linux/arch/arm/plat-s3c24xx
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 USB: s3c2410_udc: Add common implementation for GPIO controlled pullups 2011-03-07 12:23:22 -08:00
clock-dclk.c ARM: SAMSUNG: Reduce size of struct clk. 2010-01-15 17:10:10 +09:00
clock.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
common-smdk.c ARM: S3C24XX: Fix nand partition table for s3c24XX 2010-10-18 19:53:34 +09:00
cpu-freq-debugfs.c ARM: S3C: CPUFREQ: Add debugfs support for cpufreq 2009-07-30 23:22:56 +01:00
cpu-freq.c [CPUFREQ] Remove the pm_message_t argument from driver suspend 2011-03-16 17:54:33 -04:00
cpu.c ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks 2010-12-08 01:04:56 +00:00
devs.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-15 12:33:40 -08:00
dma.c S3C: DMA: Change argument of s3c2410_dma_devconfig 2010-05-17 16:43:49 +09:00
gpio.c ARM: S3C24XX: Update missed gpio calls to use gpiolib 2010-05-18 19:06:33 +09:00
gpiolib.c ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks 2010-12-08 01:04:56 +00:00
irq-pm.c ARM: S3C24XX: irq_data conversion 2011-01-03 19:15:54 +09:00
irq.c ARM: S3C24XX: irq_data conversion 2011-01-03 19:15:54 +09:00
Kconfig ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
Makefile ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
pm-simtec.c ARM: S3C: Fix Simtec copyright statements in Documentation/S3C24XX 2009-12-01 01:33:50 +00:00
pm.c ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg() 2010-05-06 10:50:42 +09:00
s3c2410-clock.c ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage 2010-05-10 11:44:38 +09:00
s3c2410-cpufreq-utils.c ARM: S3C2410: CPUFREQ: Add core support. 2009-07-30 23:22:52 +01:00
s3c2410-iotiming.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
s3c2412-iotiming.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
s3c2443-clock.c ARM: S3C24XX: Add address map and clock definitions for HSMMC0 2011-01-06 14:09:18 +09:00
setup-i2c.c ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin() 2010-05-06 09:32:29 +09:00
setup-ts.c ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
simtec-audio.c ARM: S3C24XX: machine support for Simtec Audio 2009-12-01 01:33:48 +00:00
sleep.S ARM: pm: convert samsung platforms to generic suspend/resume support 2011-02-22 17:11:25 +00:00
spi-bus0-gpe11_12_13.c ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00
spi-bus1-gpd8_9_10.c ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00
spi-bus1-gpg5_6_7.c ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00