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
..
algos	i2c: algo: pca: Fix mode selection for PCA9665	2012-09-14 15:25:22 +02:00
busses	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
muxes	i2c: Update Guenter Roeck's e-mail address	2012-07-24 14:13:56 +02:00
i2c-boardinfo.c	i2c: Update the FSF address	2012-03-26 21:47:19 +02:00
i2c-core.c	i2c-core: Fix for lockdep validator	2012-09-10 10:14:02 +02:00
i2c-core.h	i2c: Update the FSF address	2012-03-26 21:47:19 +02:00
i2c-dev.c	i2c-dev: Add support for I2C_M_RECV_LEN	2012-05-30 10:55:34 +02:00
i2c-mux.c	i2c/of: Automatically populate i2c mux busses from device tree data.	2012-05-12 14:28:16 +02:00
i2c-smbus.c	i2c-smbus: Use module_i2c_driver()	2012-07-24 14:13:57 +02:00
Kconfig	i2c: muxes are not EXPERIMENTAL anymore	2012-05-12 14:28:16 +02:00
Makefile	i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter	2011-03-20 14:50:53 +01:00