kevin/linux
1
Fork 0
Code
d8e89b47e0
linux/arch/arm/mach-tegra/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
..
clk.h ARM: tegra: clock: Add function to set SDMMC tap delay 2011-02-21 00:16:47 -08:00
debug-macro.S ARM: tegra: Centralize macros to define debug uart base 2011-02-09 21:56:59 -08:00
dma.h Fix common misspellings 2011-03-31 11:26:23 -03:00
entry-macro.S ARM: GIC: private a standard get_irqnr_preamble assembler macro 2010-12-14 19:21:47 +00:00
gpio.h ARM: tegra: add tegra_gpio_table and tegra_gpio_config 2011-02-22 17:27:11 -08:00
io.h ARM: io: make iounmap() a simple macro 2010-12-08 13:57:04 +00:00
iomap.h ARM: tegra: add devices.c entries for audio 2011-03-07 15:34:24 -08:00
irqs.h ARM: tegra: irqs: Update irq list 2011-02-09 21:57:01 -08:00
kbc.h Input: tegra-kbc - change wakeup logic to be all or nothing 2011-05-11 14:31:09 -07:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
pinmux-t2.h ARM: tegra: pinmux: Add missing drive pingroups and fix suspend 2011-02-09 21:57:02 -08:00
pinmux.h [ARM] tegra: pinmux: add safe values, move tegra2, add suspend 2010-10-21 18:11:41 -07:00
powergate.h ARM: tegra: Add api to control internal powergating 2011-02-09 21:57:00 -08:00
sdhci.h mmc: tegra: add pm_flags 2011-05-24 20:59:30 -04:00
suspend.h ARM: tegra: Add prototypes for subsystem suspend functions 2011-02-09 21:57:01 -08:00
system.h ARM: remove unnecessary mach/hardware.h includes 2011-07-12 11:19:27 -05:00
tegra_wm8903_pdata.h ARM: Tegra: Add to tegra_wm8903_platform_data 2011-04-18 17:55:58 +01:00
timex.h
uncompress.h ARM: tegra: Centralize macros to define debug uart base 2011-02-09 21:56:59 -08:00
usb_phy.h ARM: tegra: Add support for Tegra USB PHYs 2011-03-11 14:22:11 -08:00
vmalloc.h arm: tegra: VMALLOC_END should be unsigned long 2010-08-22 12:54:23 -07:00