Arnd Bergmann 421b759b86 Merge branch 'samsung/cleanup' into next/boards ... Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 17:06:36 +00:00
..
alpha
arm	Merge branch 'samsung/cleanup' into next/boards	2012-01-09 17:06:36 +00:00
avr32	macb: unify at91 and avr32 platform data	2011-11-22 15:21:16 +00:00
blackfin
cris
frv
h8300
hexagon
ia64	procfs: do not confuse jiffies with cputime64_t	2011-12-29 16:31:57 -08:00
m32r
m68k	m68k: Wire up process_vm_{read,write}v	2011-12-06 20:37:58 +01:00
microblaze	microblaze: bury asm/namei.h	2011-11-21 16:48:28 -05:00
mips	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-12-05 16:54:00 -08:00
mn10300
openrisc
parisc
powerpc	procfs: do not confuse jiffies with cputime64_t	2011-12-29 16:31:57 -08:00
s390	procfs: do not confuse jiffies with cputime64_t	2011-12-29 16:31:57 -08:00
score
sh	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
sparc	sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().	2011-12-22 13:46:53 -08:00
tile	arch/tile: use new generic {enable,disable}_percpu_irq() routines	2011-12-03 15:31:49 -05:00
um
unicore32
x86	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-12-29 17:09:16 -08:00
xtensa
.gitignore
Kconfig