android_kernel_motorola_sm6225/arch
Arnd Bergmann 928a11ba36 Merge branch 'next/cleanup' into samsung/dt
Conflicts:
	arch/arm/mach-exynos/common.c

The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.

Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 20:23:00 +00:00
..
alpha
arm Merge branch 'next/cleanup' into samsung/dt 2012-01-07 20:23:00 +00:00
avr32 macb: unify at91 and avr32 platform data 2011-11-22 15:21:16 +00:00
blackfin blackfin: Fixup export.h includes 2011-11-14 17:15:23 +08:00
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 unicore32, exec: remove redundant set_fs(USER_DS) 2011-11-16 10:50:09 +08:00
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