leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
792576b1c5
linux/arch/arm/mach-ux500
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
board-mop500-pins.c mach-ux500: add hrefv60 GPIO pins 2011-03-14 14:05:16 +01:00
board-mop500-regulators.c mach-ux500: add a few AB8500 regulator consumers v3 2011-03-14 14:05:08 +01:00
board-mop500-regulators.h mach-ux500: Updated and connected ab8500 regulator board configuration 2011-01-12 14:33:03 +00:00
board-mop500-sdi.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-stuib.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-u8500uib.c mach-ux500: add U8500 UIB platform data 2011-03-14 14:05:10 +01:00
board-mop500-uib.c mach-ux500: dynamic UIB (user interface boards) detection 2011-03-14 14:05:10 +01:00
board-mop500.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500.h mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-u5500-sdi.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
board-u5500.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
clock.c mach-ux500: update MUSB clock configurations 2011-03-14 14:05:12 +01:00
clock.h ux500: add debugfs support for powerdebug 2010-12-20 13:32:45 +01:00
cpu-db5500.c mach-ux500: add MUSB to db5500 devices 2011-03-14 14:05:12 +01:00
cpu-db8500.c mach-ux500: add MUSB to db8500 devices 2011-03-14 14:05:12 +01:00
cpu.c ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
cpufreq.c ux500: Add cpufreq support for u8500 2010-12-09 10:06:15 +01:00
devices-common.c plat-nomadik: support varying number of GPIOs per block 2011-03-14 14:05:14 +01:00
devices-common.h mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db5500.h mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db8500.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db8500.h mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices.c ux500: rework device registration 2010-12-08 13:14:06 +01:00
dma-db5500.c mach-ux500: add MUSB to db5500 devices 2011-03-14 14:05:12 +01:00
headsmp.S ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup 2010-12-24 09:50:26 +00:00
hotplug.c ARM: CPU hotplug: remove bug checks in platform_cpu_die() 2010-12-20 15:09:10 +00:00
id.c ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
Kconfig ARM: 6776/1: mach-ux500: activate fix for errata 753970 2011-03-09 21:38:03 +00:00
localtimer.c ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
Makefile mach-ux500: move MOP500 pins to separate file 2011-03-14 14:05:16 +01:00
Makefile.boot ARM: 5832/1: ARM: U8500 Makefile.boot 2009-11-28 10:22:52 +00:00
mbox-db5500.c ux500: rename modem IRQ and MBOX files 2010-12-22 09:26:49 +01:00
modem-irq-db5500.c ux500: modem_irq is only for 5500 2011-01-10 18:34:53 +01:00
pins-db5500.h ARM: 6371/1: ux500: add DB5500 pins 2010-09-19 12:12:26 +01:00
pins-db8500.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-10-25 07:59:01 -07:00
platsmp.c ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
prcmu.c ux500: Add prcmu support for operating points 2010-12-09 10:06:01 +01:00
ste-dma40-db5500.h ARM: 6372/1: ux500: add DB5500 DMA event lines 2010-09-19 12:12:27 +01:00
ste-dma40-db8500.h ARM: 6418/1: ux500: rename DB8500 DMA event line macros 2010-10-04 19:46:07 +01:00
usb.c mach-ux500: add platform data for musb 2011-03-14 14:05:11 +01:00