AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
411f5c7a50
kernel_optimize_test/arch/arm/mach-s5pc100
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 'p2v' into devel 2011-03-16 23:35:27 +00:00
clock.c ARM: S5PC100: Tidy register and disable clock usage 2011-01-04 18:27:43 +09:00
cpu.c ARM: S5P: Moves initial map for merging S5P64X0 2010-10-18 10:33:34 +09:00
dev-audio.c ASoC: Samsung: Rename AC97 platform device 2010-11-23 14:05:29 +00:00
dev-spi.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +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 ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
Kconfig ARM: SAMSUNG: Add PWM backlight support on Samsung S5PC100 2011-03-03 10:10:09 +09:00
mach-smdkc100.c ARM: SAMSUNG: Add PWM backlight support on Samsung S5PC100 2011-03-03 10:10:09 +09:00
Makefile ARM: S5PC100: Use generic S5P GPIO Interrupt interface 2010-10-21 07:54:57 +09:00
Makefile.boot
setup-fb-24bpp.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-i2c0.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +09:00
setup-i2c1.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +09:00
setup-ide.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-keypad.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-sdhci-gpio.c ARM: S5PC100: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:41 +09:00
setup-sdhci.c ARM: S5PC100: cleanup hsmmc clock definitions 2010-08-05 18:30:51 +09:00