git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 6 May 2013 21:38:00 +0000 (23:38 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 6 May 2013 21:38:00 +0000 (23:38 +0200)
commit	4183bef2e093a2f0aab45f2d5fed82b0e02aeacf
tree	e84c484db3746a0f3ead0fb7a2bb9e5a42b89e85	tree \| snapshot (tar.gz zip)
parent	662478d060a39b8faf2b1fe2fbbb212556c2e052	commit \| diff
parent	775c4f66fd855e68a98fc5049003810fe98e2e20	commit \| diff

Merge branch 'late/dt' into next/dt2

This is support for the ARM Chromebook, originally scheduled
as a "late" pull request. Since it's already late now, we
can combine this into the existing next/dt2 branch.

* late/dt:
  ARM: exynos: dts: cros5250: add EC device
  ARM: dts: Add sbs-battery for exynos5250-snow
  ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
  ARM: dts: Add chip-id controller node on Exynos4/5 SoC
  ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx28-m28evk.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx6qdl.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/tegra/clk-tegra20.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec.c	diff1 \|	diff2 \|	blob \| history