kernel_optimize_test/sound/soc/samsung
Olof Johansson e3a66aa33a 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>
2012-09-22 01:07:21 -07:00
..
ac97.c
dma.c
dma.h
goni_wm8994.c
h1940_uda1380.c
i2s-regs.h
i2s.c
i2s.h
idma.c
idma.h
jive_wm8750.c
Kconfig
littlemill.c
ln2440sbc_alc650.c
lowland.c
Makefile
neo1973_wm8753.c
pcm.c
pcm.h
regs-i2s-v2.h
rx1950_uda1380.c
s3c24xx_simtec_hermes.c
s3c24xx_simtec_tlv320aic23.c
s3c24xx_simtec.c
s3c24xx_simtec.h
s3c24xx_uda134x.c
s3c24xx-i2s.c
s3c24xx-i2s.h
s3c2412-i2s.c
s3c2412-i2s.h
s3c-i2s-v2.c
s3c-i2s-v2.h
smartq_wm8987.c
smdk2443_wm9710.c
smdk_spdif.c
smdk_wm8580.c
smdk_wm8580pcm.c
smdk_wm8994.c
smdk_wm8994pcm.c
smdk_wm9713.c
spdif.c
spdif.h
speyside.c
tobermory.c