kevin/linux
1
Fork 0
Code
6988f20fe0
linux/arch/arm/mach-davinci
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
aemif.c davinci: aemif: signedness bug in davinci_aemif_setup_timing() 2010-12-10 07:33:51 -08:00
board-da830-evm.c davinci: add spi devices support for da830/omap-l137/am17x evm 2011-03-11 10:48:29 -08:00
board-da850-evm.c davinci: DA850 EVM: kill useless variable 2011-03-11 10:48:29 -08:00
board-dm355-evm.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
board-dm355-leopard.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
board-dm365-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-dm644x-evm.c davinci: DM644x EVM: register MUSB device earlier 2011-03-15 08:17:23 -07:00
board-dm646x-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-mityomapl138.c davinci: add spi devices support for MityDSP-L138/MityARM-1808 platform 2011-03-11 10:48:29 -08:00
board-neuros-osd2.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-omapl138-hawk.c davinci: USB1.1 support for Omapl138-Hawkboard 2011-02-28 14:53:28 -08:00
board-sffsdr.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-tnetv107x-evm.c davinci: add spi devices on tnetv107x evm 2011-03-15 08:17:22 -07:00
cdce949.c davinci: misc cleanups from sparse 2010-05-06 15:02:01 -07:00
clock.c davinci: use divide ratio limits from pll_data 2010-12-10 07:33:49 -08:00
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
common.c Davinci: aintc/cpintc - use ioremap() 2010-05-13 10:05:28 -07:00
cp_intc.c ARM: davinci: irq_data conversion. 2011-01-13 17:18:26 +01:00
cpufreq.c davinci: cpufreq: fix section mismatch warning 2011-02-28 14:58:21 -08:00
cpuidle.c
da830.c davinci: macro rename DA8XX_LPSC0_DMAX to DA8XX_LPSC0_PRUSS. 2011-03-11 10:48:29 -08:00
da850.c davinci: da850: add spi device clock definitions 2011-03-11 10:48:28 -08:00
devices-da8xx.c Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable 2011-03-14 22:26:30 +00:00
devices-tnetv107x.c davinci: add tnetv107x ssp platform device 2011-03-15 08:17:22 -07:00
devices.c Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-10-25 10:59:31 -07:00
dm355.c davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
dm365.c davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
dm644x.c ASoC: davinci: fixes for multi-component 2010-11-17 18:36:40 +00:00
dm646x.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
dma.c arm: mach-davinci: check irq2ctlr() result 2010-09-24 07:40:25 -07:00
gpio-tnetv107x.c davinci: tnetv107x: fix register indexing for GPIOs numbers > 31 2011-02-28 14:53:19 -08:00
gpio.c ARM: davinci: irq_data conversion. 2011-01-13 17:18:26 +01:00
io.c Davinci: iotable based ioremap() interception 2010-05-13 10:05:31 -07:00
irq.c ARM: davinci: irq_data conversion. 2011-01-13 17:18:26 +01:00
Kconfig da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional 2010-12-22 11:45:20 -08:00
Makefile davinci: Initial support for Omapl138-Hawkboard 2010-09-24 07:40:32 -07:00
Makefile.boot
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
psc.c davinci: psc: simplify if-statement 2010-12-10 07:33:50 -08:00
serial.c Davinci: serial - conditional reset via pwremu 2010-05-06 15:02:10 -07:00
sleep.S
sram.c
time.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
tnetv107x.c davinci: add tnetv107x ssp platform device 2011-03-15 08:17:22 -07:00
usb.c DA8xx: assign name to MUSB IRQ resource 2010-12-11 12:15:53 +02:00