You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Linus Torvalds
69f1d1a6ac
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
ARM: S5P64X0: External Interrupt Support
ARM: EXYNOS4: Enable MFC on Samsung NURI
ARM: EXYNOS4: Enable MFC on universal_c210
ARM: S5PV210: Enable MFC on Goni
ARM: S5P: Add support for MFC device
ARM: EXYNOS4: Add support FIMD on SMDKC210
ARM: EXYNOS4: Add platform device and helper functions for FIMD
ARM: EXYNOS4: Add resource definition for FIMD
ARM: EXYNOS4: Change devname for FIMD clkdev
ARM: SAMSUNG: Add IRQ_I2S0 definition
ARM: SAMSUNG: Add platform device for idma
ARM: EXYNOS4: Add more registers to be saved and restored for PM
ARM: EXYNOS4: Add more register addresses of CMU
ARM: EXYNOS4: Add platform device for dwmci driver
ARM: EXYNOS4: configure rtc-s3c on NURI
ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
ARM: EXYNOS4: configure ADC on NURI
ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
...
Fix up tons of silly conflicts:
- arch/arm/mach-davinci/include/mach/psc.h
- arch/arm/mach-exynos4/Kconfig
- arch/arm/mach-exynos4/mach-smdkc210.c
- arch/arm/mach-exynos4/pm.c
- arch/arm/mach-imx/mm-imx1.c
- arch/arm/mach-imx/mm-imx21.c
- arch/arm/mach-imx/mm-imx25.c
- arch/arm/mach-imx/mm-imx27.c
- arch/arm/mach-imx/mm-imx31.c
- arch/arm/mach-imx/mm-imx35.c
- arch/arm/mach-mx5/mm.c
- arch/arm/mach-s5pv210/mach-goni.c
- arch/arm/mm/Kconfig
|
14 years ago |
| .. |
|
include/mach
|
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
|
14 years ago |
|
Kconfig
|
mach-ux500: Kconfig for snowball board
|
14 years ago |
|
Makefile
|
mfd: update DB8500 PRCMU driver
|
14 years ago |
|
Makefile.boot
|
…
|
|
|
board-mop500-pins.c
|
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel
|
14 years ago |
|
board-mop500-regulators.c
|
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
|
14 years ago |
|
board-mop500-regulators.h
|
…
|
|
|
board-mop500-sdi.c
|
mach-ux500: Add SDI support for snowball board
|
14 years ago |
|
board-mop500-stuib.c
|
…
|
|
|
board-mop500-u8500uib.c
|
staging: ste_rmi4: remove cross-dependent platform data
|
14 years ago |
|
board-mop500-uib.c
|
mach-x500: fix SECTION warnings in uib
|
14 years ago |
|
board-mop500.c
|
Merge branches 'cns3xxx/devel', 'davinci/devel', 'imx/devel', 'lpc32xx/devel', 'pxa/devel', 'tegra/devel' and 'stericsson/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/devel
|
14 years ago |
|
board-mop500.h
|
mach-ux500: Add SDI support for snowball board
|
14 years ago |
|
board-u5500-sdi.c
|
…
|
|
|
board-u5500.c
|
mach-ux500: add lm3530 ALS platform data for U5500
|
14 years ago |
|
clock.c
|
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
|
14 years ago |
|
clock.h
|
…
|
|
|
cpu-db5500.c
|
mach-ux500: iomap PRCMU TCDM memory
|
14 years ago |
|
cpu-db8500.c
|
gpio/nomadik: fix sleepmode for elder Nomadik
|
14 years ago |
|
cpu.c
|
mfd: add DB5500 PRCMU driver
|
14 years ago |
|
devices-common.c
|
…
|
|
|
devices-common.h
|
ARM: 6830/1: mach-ux500: force PrimeCell revisions
|
14 years ago |
|
devices-db5500.h
|
ARM: 6830/1: mach-ux500: force PrimeCell revisions
|
14 years ago |
|
devices-db8500.c
|
…
|
|
|
devices-db8500.h
|
ARM: 6830/1: mach-ux500: force PrimeCell revisions
|
14 years ago |
|
devices.c
|
…
|
|
|
dma-db5500.c
|
…
|
|
|
headsmp.S
|
…
|
|
|
hotplug.c
|
…
|
|
|
id.c
|
…
|
|
|
localtimer.c
|
…
|
|
|
mbox-db5500.c
|
treewide: Fix iomap resource size miscalculations
|
14 years ago |
|
modem-irq-db5500.c
|
…
|
|
|
pins-db5500.h
|
…
|
|
|
pins-db8500.h
|
…
|
|
|
platsmp.c
|
ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1
|
14 years ago |
|
ste-dma40-db5500.h
|
…
|
|
|
ste-dma40-db8500.h
|
…
|
|
|
usb.c
|
mach-ux500: fix USB build error
|
14 years ago |
