OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
original_kernel/arch/arm/mach-tegra
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
..
include/mach Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
Kconfig
…
Makefile
…
Makefile.boot
…
board-harmony-pcie.c
…
board-harmony-pinmux.c
…
board-harmony-power.c
…
board-harmony.c ARM: tegra: remove copy-and-pasted i2c platform data in boards 2011-07-12 20:39:02 -07:00
board-harmony.h
…
board-paz00-pinmux.c ARM: tegra: paz00: cleanup sdhci ports 2011-07-12 20:38:56 -07:00
board-paz00.c ARM: tegra: remove copy-and-pasted usb platform data from boards 2011-07-12 20:39:40 -07:00
board-paz00.h ARM: tegra: paz00: cleanup sdhci ports 2011-07-12 20:38:56 -07:00
board-seaboard-pinmux.c
…
board-seaboard.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-seaboard.h
…
board-trimslice-pinmux.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
board-trimslice.c ARM: tegra: remove copy-and-pasted usb platform data from boards 2011-07-12 20:39:40 -07:00
board-trimslice.h ARM: tegra: trimslice: enable USB ports 2011-07-12 20:39:00 -07:00
board.h
…
clock.c switch assorted clock drivers to debugfs_remove_recursive() 2011-07-20 20:47:51 -04:00
clock.h
…
common.c
…
cpu-tegra.c
…
devices.c ARM: tegra: remove copy-and-pasted usb platform data from boards 2011-07-12 20:39:40 -07:00
devices.h
…
dma.c
…
fuse.c
…
fuse.h
…
gpio-names.h
…
headsmp.S
…
hotplug.c
…
io.c ARM: remove unnecessary mach/hardware.h includes 2011-07-12 11:19:27 -05:00
irq.c
…
localtimer.c
…
pcie.c ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
pinmux-t2-tables.c
…
pinmux.c
…
platsmp.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
powergate.c
…
tegra2_clocks.c arm: tegra: remove generic disp clock divisor flag 2011-07-12 20:38:57 -07:00
tegra2_emc.c
…
tegra2_emc.h
…
timer.c
…
usb_phy.c
…