AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
71189284e6
kernel_optimize_test/arch/arm/mach-kirkwood
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
addr-map.c
common.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
common.h ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
cpuidle.c
d2net_v2-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
db88f6281-bp-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
dockstar-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
guruplug-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
irq.c ARM: Remove dependency of plat-orion GPIO code on mach directory includes. 2011-03-03 16:27:02 -05:00
Kconfig Kirkwood: Add support for 6282 based QNAP devices 2010-12-07 13:50:14 -05:00
lacie_v2-common.c [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile [ARM] Kirkwood: remove duplicated code in LaCie setup files 2010-09-19 22:43:45 -04:00
Makefile.boot
mpp.c ARM: Remove dependency of plat-orion GPIO code on mach directory includes. 2011-03-03 16:27:02 -05:00
mpp.h
mv88f6281gtw_ge-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
netspace_v2-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
netxbig_v2-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
openrd-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
pcie.c [ARM] Kirkwood: enable PCIe before reading device ID register 2011-03-03 16:26:56 -05:00
rd88f6192-nas-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
rd88f6281-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
sheevaplug-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
t5325-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
ts41x-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
ts219-setup.c ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
tsx1x-common.c
tsx1x-common.h