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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 May 2014 23:44:00 +0000 (09:44 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 May 2014 23:44:00 +0000 (09:44 +1000)
commit	eb9feae5d5793c08b10ed112ade20bdc1e233c05
tree	40b669f3fbee7ef556209b4c75383cf6dff08187	tree \| snapshot
parent	3ab3ae471a256e33824ddef93ef15b1864a3e1f1	commit \| diff
parent	936663c3549a6f99ed341ccc379331bd48a0c7ff	commit \| diff

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

Conflicts:
arch/arm/mach-exynos/exynos.c
arch/arm/mach-mvebu/board-v7.c
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-rockchip/rockchip.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/common.c

24 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/prima2.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/exynos.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mvebu/board-v7.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-mpuss-lowpower.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap4-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/rockchip.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva-reference.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7778.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7779.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sti/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/ct-ca9x4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/common.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/timer-marco.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	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/prima2.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/exynos.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mvebu/board-v7.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/io.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap-mpuss-lowpower.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap4-common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rockchip/rockchip.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva-reference.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-armadillo800eva.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7778.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-r8a7779.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sti/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/ct-ca9x4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-zynq/common.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/timer-marco.c	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/Kconfig	diff1 \|	diff2 \|	blob \| history