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

Merge branch 'multiplatform/platform-data' into next/multiplatform

* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>

author	Olof Johansson <olof@lixom.net>
	Sat, 22 Sep 2012 07:22:33 +0000 (00:22 -0700)
committer	Olof Johansson <olof@lixom.net>
	Sat, 22 Sep 2012 08:07:21 +0000 (01:07 -0700)
commit	42d54d6097119529870fe1d03853c2abeeb0a4ee
tree	fb8786f1300bdce8f6fc7462e3fd5699e057dd24	tree \| snapshot
parent	88f4f374068c6c91ce81b3955e162679f4311e88	commit \| diff
parent	a2554a0e288fa7e3f782b8e61d2d590931514a9c	commit \| diff

arch/arm/mach-at91/at91sam9g45_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9rl_devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-dove/common.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-kirkwood/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/db88f6281-bp-setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/sram.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/board-qsd8x50.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/include/mach/board.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mv78xx0/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-orion5x/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/devices.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/pxa3xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-anubis.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-jive.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-mini2440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-nexcoder.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/mach-osiris.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/board-mop500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-orion/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/devs.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/pxaficp_ir.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history
include/linux/platform_data/camera-mx2.h	\|	diff2 \|	blob \| history