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

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

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 5 Jan 2012 13:25:15 +0000 (13:25 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 5 Jan 2012 13:25:27 +0000 (13:25 +0000)
commit	7b9dd47136c07ffd883aff6926c7b281e4c1eea4
tree	b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c	tree \| snapshot
parent	2e0e943436912ffe0848ece58167edfe754edb96	commit \| diff
parent	0575fb754dbfc32a01f297e778533340a533ec68	commit \| diff

Merge branch 'restart' into for-linus

Conflicts:
arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.

97 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-cns3xxx/cns3420vb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/adssphere.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/edb93xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/gesbc9312.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/micro9.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/simone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/snappercl15.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/ts72xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	\|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-armlex4210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdk4x12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-highbank/highbank.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/sheevaplug-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-netx/nxdb500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-netx/nxdkn.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-netx/nxeb500hmi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3630sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517crane.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-apollon.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t3517.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-h4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ldp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-n8x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3logic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3pandora.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3stalker.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3touchbook.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rm680.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts209-setup.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_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smartq5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smartq7.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6400.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6450.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/mach-smdkc100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-aquila.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkc110.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-torbreck.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/nanoengine.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear3xx/spear300_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear3xx/spear310_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear3xx/spear320_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear6xx/spear600_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/u300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/versatile_ab.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/versatile_dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/versatile_pb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-iop/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	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/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-cns3xxx/cns3420vb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/adssphere.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/edb93xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/gesbc9312.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/micro9.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/simone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/snappercl15.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/ts72xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	\|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-armlex4210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdk4x12.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-highbank/highbank.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/sheevaplug-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-netx/nxdb500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-netx/nxdkn.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-netx/nxeb500hmi.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3630sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517crane.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-am3517evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-apollon.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t3517.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-h4.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ldp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-n8x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3logic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3pandora.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3stalker.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3touchbook.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rm680.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts209-setup.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_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smartq5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smartq7.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6400.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6450.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/mach-smdkc100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-aquila.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkc110.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-torbreck.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/nanoengine.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear3xx/spear300_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear3xx/spear310_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear3xx/spear320_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-spear6xx/spear600_evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/u300.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/versatile_ab.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/versatile_dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/versatile_pb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/v2m.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-iop/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history