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
..
alpha	Merge 3.6-rc3 into tty-next	2012-08-27 07:13:33 -07:00
arm	Merge branch 'multiplatform/platform-data' into next/multiplatform	2012-09-22 01:07:21 -07:00
avr32
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin	2012-09-12 07:12:53 +08:00
c6x	Enable atomic64 ops in C6X	2012-08-17 08:10:12 -07:00
cris
frv
h8300
hexagon
ia64	Merge 3.6-rc3 into tty-next	2012-08-27 07:13:33 -07:00
m32r
m68k	Merge 3.6-rc3 into tty-next	2012-08-27 07:13:33 -07:00
microblaze
mips	Merge branch 'depends/tty-omap-serial' into next/cleanup	2012-09-16 20:04:39 -07:00
mn10300
openrisc
parisc	Merge branch 'depends/tty-omap-serial' into next/cleanup	2012-09-16 20:04:39 -07:00
powerpc	powerpc: Don't use __put_user() in patch_instruction	2012-09-05 16:05:23 +10:00
s390	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-09-14 17:43:45 -07:00
score
sh
sparc
tile
um	Merge branch 'depends/tty-omap-serial' into next/cleanup	2012-09-16 20:04:39 -07:00
unicore32
x86	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-09-14 17:43:45 -07:00
xtensa
.gitignore
Kconfig