Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 02:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
4791d63bd4
linux/arch/arm/mach-mmp/include/mach
History
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
2011-07-26 17:41:04 -07:00
..
addr-map.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
cputype.h ARM: mmp: fix cpuid detection on mmp2 2010-11-03 23:11:16 +08:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
devices.h [ARM] mmp: avoid devices.h being included multiple times 2010-08-05 14:34:45 +08:00
dma.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
entry-macro.S [ARM] mmp: add support for Marvell MMP2 2010-03-02 07:40:55 +08:00
gpio.h ARM: mmp: align NR_BUILTIN_GPIO with gpio interrupt number 2011-04-12 23:26:39 +08:00
hardware.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
io.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
irqs.h ARM: mmp: support sparse irq 2010-10-09 17:07:25 +08:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
mfp-gplugd.h ARM: pxa168: Add board support for gplugD 2011-07-12 19:50:37 +08:00
mfp-mmp2.h ARM: mmp: MMP2 drive strength FAST using wrong value 2011-01-15 04:29:19 -06:00
mfp-pxa168.h ARM: pxa168: Add support for Ethernet 2011-07-12 19:50:36 +08:00
mfp-pxa910.h ARM: mmp: PXA910 drive strength FAST using wrong value 2011-01-15 04:29:20 -06:00
mfp.h [ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910} 2009-05-22 18:15:31 +08:00
mmp2.h mmc: sdhci-pxa: move platform data to include/linux/platform_data 2011-07-20 17:20:52 -04:00
pxa168.h ARM: pxa168: Add support for Ethernet 2011-07-12 19:50:36 +08:00
pxa910.h ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
regs-apbc.h [ARM] mmp: support ssp in pxa168 2010-05-11 17:24:59 +02:00
regs-apmu.h ARM: pxa168: Add support for Ethernet 2011-07-12 19:50:36 +08:00
regs-icu.h [ARM] mmp2: add missing ICU register definitions 2010-03-02 07:40:57 +08:00
regs-smc.h [ARM] mmp: add smc registers definition 2010-05-11 17:25:06 +02:00
regs-timers.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
system.h ARM: pxa168: fix corrected reset vector 2010-09-25 09:47:03 +08:00
teton_bga.h ARM: pxa168: added support for Teton BGA platform 2010-10-09 17:07:26 +08:00
timex.h [ARM] mmp: fix clock tick rate in mmp2 2010-05-11 17:25:05 +02:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00