git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 22:58:06 +0000 (23:58 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 31 Oct 2011 23:11:41 +0000 (00:11 +0100)
commit	87c7a2500224dd09edf8a14f028e841ebeac0ad5
tree	64a1035b02cb8aae34b96fc7c1c7caaad337ac07	tree \| snapshot
parent	7a6052125d261a766cc2ecf22a673e766dff341d	commit \| diff
parent	fdd6b92952cb7acd63dd1656e8ad20c30831b551	commit \| diff

Merge branch 'depends/rmk/devel-stable' into next/board

The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/include/mach/entry-macro.S
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mct.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

70 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp_scu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/edb93xx.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/vision_ep9307.c	diff1 \|	\|	blob \| history
arch/arm/mach-exynos4/include/mach/entry-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mct.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/dsmg600-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/fsg-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nas100d-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nslu2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/omixp-setup.c	diff1 \|	\|	blob \| history
arch/arm/mach-ks8695/board-acs5k.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-dsm320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-micrel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-lpc32xx/phy3250.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x30.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-qsd8x50.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-sapphire.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-ams-delta.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-fsample.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-htcherald.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-innovator.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-nokia770.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmte.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmtt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmz71.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-perseus2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-sx1.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-voiceblue.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-ldp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/db88f5281-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/kurobox_pro-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/mv2120-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5182-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/terastation_pro2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts209-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts409-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wnr854t-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wrt350n-v2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.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/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-u5500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp_scu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/edb93xx.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/vision_ep9307.c	diff1 \|	\|	blob \| history
arch/arm/mach-exynos4/include/mach/entry-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mct.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/dsmg600-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/fsg-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nas100d-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/nslu2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/omixp-setup.c	diff1 \|	\|	blob \| history
arch/arm/mach-ks8695/board-acs5k.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-dsm320.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ks8695/board-micrel.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-lpc32xx/phy3250.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-msm7x30.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-qsd8x50.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-sapphire.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-nomadik/board-nhk8815.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-ams-delta.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-fsample.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-h3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-htcherald.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-innovator.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-nokia770.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-osk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmte.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmtt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-palmz71.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-perseus2.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-sx1.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap1/board-voiceblue.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-ldp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/db88f5281-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/dns323-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/kurobox_pro-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/mv2120-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f5182-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/terastation_pro2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts209-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/ts409-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wnr854t-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/wrt350n-v2-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/irq.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/lpd270.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saarb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.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/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-u5500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history