FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-16 22:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93f2936104
linux/arch/arm/mach-ux500/include/mach
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
..
clkdev.h
db5500-regs.h ux500: Add DMA support for U5500 2010-12-08 13:21:31 +01:00
db8500-regs.h
debug-macro.S ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
devices.h
entry-macro.S ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
gpio.h ux500: rework gpio registration 2010-12-08 13:25:00 +01:00
hardware.h ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
id.h ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
io.h
irqs-board-mop500.h mach-ux500: add STMPE1601 platform data 2010-12-19 20:54:55 +01:00
irqs-db5500.h
irqs-db8500.h
irqs.h ux500: rename MOP board Kconfig 2011-01-10 18:34:53 +01:00
mbox-db5500.h ux500: rename modem IRQ and MBOX files 2010-12-22 09:26:49 +01:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
prcmu-defs.h ux500: Add prcmu support for operating points 2010-12-09 10:06:01 +01:00
prcmu-regs.h ux500: Add prcmu support for operating points 2010-12-09 10:06:01 +01:00
prcmu.h ux500: Add prcmu support for operating points 2010-12-09 10:06:01 +01:00
setup.h ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
smp.h ARM: SMP: remove smp_mpidr.h 2010-12-20 15:09:11 +00:00
system.h
timex.h
uncompress.h mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
usb.h mach-ux500: add platform data for musb 2011-03-14 14:05:11 +01:00
vmalloc.h