You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Olof Johansson 25468fe89f Merge branch 'multiplatform/smp_ops' into next/multiplatform ... * multiplatform/smp_ops: ARM: consolidate pen_release instead of having per platform definitions ARM: smp: Make SMP operations mandatory ARM: SoC: convert spear13xx to SMP operations ARM: SoC: convert imx6q to SMP operations ARM: SoC: convert highbank to SMP operations ARM: SoC: convert shmobile SMP to SMP operations ARM: SoC: convert ux500 to SMP operations ARM: SoC: convert MSM to SMP operations ARM: SoC: convert Exynos4 to SMP operations ARM: SoC: convert Tegra to SMP operations ARM: SoC: convert OMAP4 to SMP operations ARM: SoC: convert VExpress/RealView to SMP operations ARM: SoC: add per-platform SMP operations Conflicts due to file moves or removals in: arch/arm/mach-msm/board-msm8960.c arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-tegra/board-harmony.c arch/arm/mach-tegra/board-trimslice.c Conflicts due to board file cleanup: arch/arm/mach-tegra/board-paz00.c Conflicts due to cpu hotplug addition: arch/arm/mach-tegra/hotplug.c Signed-off-by: Olof Johansson <olof@lixom.net>		13 years ago
..
alpha	Merge 3.6-rc3 into tty-next	13 years ago
arm	Merge branch 'multiplatform/smp_ops' into next/multiplatform	13 years ago
avr32	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin	13 years ago
c6x	Enable atomic64 ops in C6X	13 years ago
cris	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
frv	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
h8300	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
hexagon	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	13 years ago
ia64	Merge 3.6-rc3 into tty-next	13 years ago
m32r	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
m68k	Merge 3.6-rc3 into tty-next	13 years ago
microblaze	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	13 years ago
mips	Merge branch 'depends/tty-omap-serial' into next/cleanup	13 years ago
mn10300	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
openrisc	…
parisc	Merge branch 'depends/tty-omap-serial' into next/cleanup	13 years ago
powerpc	powerpc: Don't use __put_user() in patch_instruction	13 years ago
s390	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
score	…
sh	Merge branches 'sh/urgent' and 'sh/gpiolib' into sh-latest	13 years ago
sparc	sparc64: Be less verbose during vmemmap population.	13 years ago
tile	memcg: rename config variables	13 years ago
um	Merge branch 'depends/tty-omap-serial' into next/cleanup	13 years ago
unicore32	…
x86	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
xtensa	TTY: use tty_port_link_device	13 years ago
.gitignore	…
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago