Ingo Molnar c90423d1de Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move ...

Conflicts:
	kernel/Makefile

There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-11-06 07:50:37 +01:00

..

alchemy

MIPS: Alchemy: MTX-1: fix incorrect placement of __initdata tag

2013-09-30 15:14:07 +02:00

ar7

MIPS: FW: Remove obsolete header file for MTI platforms.

2013-05-08 12:30:10 +02:00

ath79

MIPS: ath79: Switch to the clkdev framework

2013-09-03 23:22:18 +02:00

bcm47xx

MIPS: Set default CPU type for BCM47XX platforms

2013-07-30 18:48:50 +02:00

bcm63xx

MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks

2013-09-18 20:25:19 +02:00

boot

MIPS: Fix invalid symbolic link file

2013-09-19 17:04:35 +02:00

cavium-octeon

MIPS: Optimize current_cpu_type() for better code.

2013-09-17 18:50:53 +02:00

cobalt

MIPS: Idle: Consolidate all declarations in <asm/idle.h>.

2013-05-22 01:34:27 +02:00

configs

MIPS: Lantiq: Add defconfig for xway SoC

2013-09-03 23:22:16 +02:00

dec

MIPS: Optimize current_cpu_type() for better code.

2013-09-17 18:50:53 +02:00

emma

MIPS: Whitespace cleanup.

2013-02-01 10:00:22 +01:00

fw

MIPS: sibyte: Declare the cfe_write() buffer as constant

2013-06-21 18:07:02 +02:00

include

Merge branch 'core/urgent' into sched/core

2013-10-11 07:39:37 +02:00

jazz

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2013-03-02 07:44:16 -08:00

jz4740

MIPS: jz4740: Correct clock gate bit for DMA controller

2013-07-05 11:40:53 +05:30

kernel

Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move

2013-11-06 07:50:37 +01:00

kvm

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2013-09-04 18:15:06 -07:00

lantiq

MIPS: Lantiq: Falcon: fix asc clock definition

2013-09-03 23:22:16 +02:00

lasat

MIPS: Refactor load/entry address calculations

2013-09-03 17:58:37 +02:00

lib

MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code

2013-07-14 19:36:51 -04:00

loongson

MIPS: Loongson: Hide the pci code behind CONFIG_PCI

2013-09-03 15:27:39 +02:00

loongson1

MIPS: Idle: Consolidate all declarations in <asm/idle.h>.

2013-05-22 01:34:27 +02:00

math-emu

MIPS: Remove unreachable break statements from cp1emu.c

2013-08-26 15:33:40 +02:00

mm

Merge tag 'v3.12-rc4' into sched/core

2013-10-09 12:36:13 +02:00

mti-malta

MIPS: malta: Fix GIC interrupt offsets

2013-10-30 15:43:18 +01:00

mti-sead3

MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks

2013-09-18 20:25:19 +02:00

netlogic

MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks

2013-09-18 20:25:19 +02:00

oprofile

MIPS: Optimize current_cpu_type() for better code.

2013-09-17 18:50:53 +02:00

pci

MIPS: PCI: pci-bcm1480: Include missing vt.h header

2013-09-19 12:50:16 +02:00

pmcs-msp71xx

MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code

2013-07-14 19:36:51 -04:00

pnx833x

MIPS: PNX833x: PNX8335_PCI_ETHERNET_INT depends on CONFIG_SOC_PNX8335

2013-08-05 13:34:22 +02:00

power

MIPS: Whitespace cleanup.

2013-02-01 10:00:22 +01:00

powertv

MIPS: powertv: Drop BOOTLOADER_DRIVER Kconfig symbol

2013-09-03 16:48:37 +02:00

ralink

MIPS: ralink: fix return value check in rt_timer_probe()

2013-10-31 12:38:34 +01:00

rb532

MIPS: Whitespace cleanup.

2013-02-01 10:00:22 +01:00

sgi-ip22

MIPS: Whitespace cleanup.

2013-02-01 10:00:22 +01:00

sgi-ip27

MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code

2013-07-14 19:36:51 -04:00

sgi-ip32

MIPS: Whitespace cleanup.

2013-02-01 10:00:22 +01:00

sibyte

MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks

2013-09-18 20:25:19 +02:00

sni

MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks

2013-09-18 20:25:19 +02:00

txx9

MIPS: TXx9: Fix build error if CONFIG_TOSHIBA_JMR3927 is not selected

2013-09-03 15:30:50 +02:00

vr41xx

MIPS: Idle: Consolidate all declarations in <asm/idle.h>.

2013-05-22 01:34:27 +02:00

Kbuild

KVM/MIPS32: Infrastructure/build files.

2013-05-08 03:55:34 +02:00

Kbuild.platforms

MIPS: Delete Wind River ppmc eval board support.

2013-07-01 15:10:53 +02:00

Kconfig

Remove GENERIC_HARDIRQ config option

2013-09-13 15:09:52 +02:00

Kconfig.debug

consolidate per-arch stack overflow debugging options

2013-07-04 11:25:39 -07:00

Makefile

MIPS: Remove useless comment about kprobe from arch/mips/Makefile

2013-09-18 18:37:48 +02:00