git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h

author	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 13:00:02 +0000 (15:00 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 13:00:02 +0000 (15:00 +0200)
commit	c28ad2bc713103b2b4c0ef77bc91dcd9382208c3
tree	fe9fcaab51cb5adea955070f6609dc998d46db69	tree \| snapshot
parent	1e27ab4d297fda68b0f2cdb6b274108c2a4a350e	commit \| diff
parent	ed838ba22ae2a7e9f83200e17835e199be5c04c4	commit \| diff

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c

33 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3-beagle-xm.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap4.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap5.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/common/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da830-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm365-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm644x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm646x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-exynos4-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-exynos5-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-highbank/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rx51-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/fuse.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/block/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/integrator-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/Kconfig.arm	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ide/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/serio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pci/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-s3c2410.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500.c	diff1 \|	diff2 \|	blob \| history
drivers/video/cyber2000fb.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3-beagle-xm.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap4.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap5.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/common/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da830-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-da850-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm365-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm644x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/board-dm646x-evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-exynos4-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-exynos5-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-highbank/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rx51-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/fuse.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/block/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/integrator-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/Kconfig.arm	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ide/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/serio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pci/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-s3c2410.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/ux500.c	diff1 \|	diff2 \|	blob \| history
drivers/video/cyber2000fb.c	diff1 \|	diff2 \|	blob \| history