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
..
gameport	Input: use module_pci_driver	2012-04-21 23:48:58 -07:00
joystick	Merge branch 'next' into for-linus	2012-07-24 22:43:04 -07:00
keyboard	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
misc	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
mouse	ARM: pxa: move platform_data definitions	2012-09-14 11:18:10 +02:00
serio	ARM: OMAP1: Move board-ams-delta.h from plat to mach	2012-09-20 15:02:19 -07:00
tablet	Input: wacom - add support for EMR on Cintiq 24HD touch	2012-08-21 22:14:43 -07:00
touchscreen	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
apm-power.c
evbug.c
evdev.c	Input: evdev - properly handle read/write with count 0	2012-05-02 00:23:58 -07:00
ff-core.c
ff-memless.c	Input: ff-memless - fix a couple min_t() casts	2012-07-07 18:20:12 -07:00
input-compat.c
input-compat.h
input-mt.c	Input: MT - fix null pointer warning	2012-06-04 16:33:34 +02:00
input-polldev.c
input.c
joydev.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
Kconfig	Input: matrix-keymap - uninline and prepare for device tree support	2012-05-10 22:38:47 -07:00
Makefile	Input: matrix-keymap - uninline and prepare for device tree support	2012-05-10 22:38:47 -07:00
matrix-keymap.c	Input: matrix-keymap - fix building keymaps	2012-05-24 01:12:20 -07:00
mousedev.c
sparse-keymap.c