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
7182297ebb
linux/arch/arm/plat-samsung
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/plat Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
adc.c ARM: SAMSUNG: Fix build warnings because of unused codes 2010-10-08 13:50:17 +09:00
clock-clksrc.c ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. 2010-01-18 16:00:56 +09:00
clock.c ARM: SAMSUNG: Add support for clock debugging through debug-fs interface 2011-01-12 13:40:04 +09:00
dev-adc.c ARM: SAMSUNG: Moving ADC device definition to plat-samsung. 2010-05-18 13:38:44 +09:00
dev-asocdma.c ARM: Samsung: Make sure ASoC DMA device is prototyped 2010-11-25 11:19:53 +00:00
dev-fb.c ARM: SAMSUNG: Set S3C_FB_MAX_WIN in <plat/fb.h> 2010-05-18 18:46:27 +09:00
dev-hsmmc1.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hsmmc2.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hsmmc3.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hsmmc.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hwmon.c ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung 2010-05-12 17:43:03 +09:00
dev-i2c0.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
dev-i2c1.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
dev-i2c2.c ARM: S5PV210: Fix wrong interrupt I2C2 and I2C3 number 2010-10-25 16:03:27 +09:00
dev-i2c3.c ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support 2010-10-25 16:03:43 +09:00
dev-i2c4.c ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support 2010-10-25 16:03:43 +09:00
dev-i2c5.c ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support 2010-10-25 16:03:43 +09:00
dev-i2c6.c ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support 2010-10-25 16:03:43 +09:00
dev-i2c7.c ARM: S5PV310: Add I2C channel 3, 4, 5, 6, and 7 device support 2010-10-25 16:03:43 +09:00
dev-ide.c ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
dev-keypad.c ARM: SAMSUNG: Add keypad device support 2010-08-06 21:27:50 +09:00
dev-nand.c ARM: SAMSUNG: Don't export __init functions to modules 2011-01-06 14:09:19 +09:00
dev-onenand.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
dev-pwm.c ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
dev-rtc.c ARM: SAMSUNG: Move RTC device definitions in plat-samsung 2010-05-18 16:44:58 +09:00
dev-ts.c ARM: SAMSUNG: Drop exporting s3c24xx_ts_set_platdata 2011-02-18 17:36:32 +09:00
dev-uart.c ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices 2011-03-04 15:46:26 +09:00
dev-usb-hsotg.c ARM: SAMSUNG: Add DMA masks to hsotg device 2010-02-03 01:54:54 +00:00
dev-usb.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
dev-wdt.c ARM: SAMSUNG: Reduce virtual memory size for WDT device 2010-08-05 18:32:49 +09:00
dma.c ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung 2010-02-23 00:03:43 +00:00
gpio-config.c ARM: S3C2443: Implement GPIO pull-up/down configuration methods 2011-01-06 14:09:19 +09:00
gpio.c ARM: SAMSUNG: Add common samsung_gpiolib_to_irq function 2010-10-21 07:54:57 +09:00
gpiolib.c ARM: SAMSUNG: Cleanup GPIOlib adding 2bit chips 2010-12-30 09:37:28 +09:00
init.c ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung 2010-02-23 00:03:43 +00:00
irq-uart.c ARM: SAMSUNG: some GENERIC_HARDIRQS_NO_DEPRECATED build fixes 2011-01-03 19:20:06 +09:00
irq-vic-timer.c ARM: SAMSUNG: some GENERIC_HARDIRQS_NO_DEPRECATED build fixes 2011-01-03 19:20:06 +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: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
pd.c ARM: SAMSUNG: Add support for Power Domain control 2010-12-30 09:36:52 +09:00
platformdata.c ARM: SAMSUNG: Add helper to clone and set platform data 2010-08-05 18:32:49 +09:00
pm-check.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
pm-gpio.c ARM: S5PV210: Add Power Management Support 2010-10-21 07:54:57 +09:00
pm.c ARM: pm: convert samsung platforms to generic suspend/resume support 2011-02-22 17:11:25 +00:00
pwm-clock.c ARM: SAMSUNG: Move pwm-clock code into plat-samsung 2010-01-15 17:10:12 +09:00
pwm.c ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
s3c-pl330.c ARM: SAMSUNG: Move DMA clock enable into S3C PL330 driver 2010-10-25 16:10:56 +09:00
time.c ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung 2010-02-23 00:03:43 +00:00
wakeup-mask.c ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00