Ingo Molnar 737f24bda7 Merge branch 'perf/urgent' into perf/core ...

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2012-03-05 09:20:08 +01:00

..

alchemy

Merge branch 'next/alchemy' into mips-for-linux-next

2012-01-11 15:42:10 +01:00

ar7

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

ath79

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

bcm47xx

MIPS: Fix up inconsistency in panic() string argument.

2011-12-07 22:01:45 +00:00

bcm63xx

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

2012-01-14 13:05:21 -08:00

boot

MIPS: Alchemy: Basic support for the DB1300 board.

2011-12-07 22:02:06 +00:00

cavium-octeon

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

cobalt

MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD

2011-09-21 17:52:15 +02:00

configs

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

dec

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

emma

MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check

2011-11-08 12:35:29 +00:00

fw

Merge branch 'master' into for-next

2011-04-26 10:22:59 +02:00

include/asm

static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()

2012-02-24 10:05:59 +01:00

jazz

Merge branch 'next/generic' into mips-for-linux-next

2012-01-11 15:41:47 +01:00

jz4740

MIPS: Fix up inconsistency in panic() string argument.

2011-12-07 22:01:45 +00:00

kernel

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

lantiq

Merge branch 'next/generic' into mips-for-linux-next

2012-01-11 15:41:47 +01:00

lasat

MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD

2011-09-21 17:52:15 +02:00

lib

mips: use the the PCI controller's io_map_base

2012-01-31 23:20:30 +02:00

loongson

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

math-emu

MIPS Kprobes: Refactor branch emulation

2011-12-07 22:04:03 +00:00

mipssim

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

mm

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next

2012-01-11 15:42:31 +01:00

mti-malta

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

netlogic

MIPS: Netlogic: Mark Netlogic chips as SMT capable

2011-12-07 22:04:57 +00:00

oprofile

MIPS: oprofile: Add callgraph support

2011-06-15 14:35:34 +02:00

pci

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

2012-01-14 13:05:21 -08:00

pmc-sierra

Merge branch 'next/generic' into mips-for-linux-next

2012-01-11 15:41:47 +01:00

pnx833x

Fix common misspellings

2011-03-31 11:26:23 -03:00

pnx8550

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

power

MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb

2011-05-10 18:15:26 +01:00

powertv

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

rb532

mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:30:57 -04:00

sgi-ip22

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

sgi-ip27

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

2012-01-14 13:05:21 -08:00

sgi-ip32

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

sibyte

MIPS: Sibyte: drop select of SIBYTE_CFE

2011-11-13 21:27:34 +01:00

sni

MIPS: irq: Remove IRQF_DISABLED

2011-12-07 22:03:45 +00:00

txx9

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

2012-01-14 13:05:21 -08:00

vr41xx

mips: fix implicit smp.h usage in various files.

2011-10-31 19:30:55 -04:00

wrppmc

MIPS: WRPPMC: Migrate to new platform makefile style.

2010-08-05 13:25:51 +01:00

Kbuild

MIPS: Repair Kbuild make clean breakage.

2010-10-19 18:32:39 +01:00

Kbuild.platforms

MIPS: XLR, XLS: Move makefile bits to were they belong.

2011-07-20 23:12:11 +01:00

Kconfig

mips: use the the PCI controller's io_map_base

2012-01-31 23:20:30 +02:00

Kconfig.debug

lib: consolidate DEBUG_STACK_USAGE option

2011-05-25 08:39:54 -07:00

Makefile

MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS

2011-12-07 22:03:17 +00:00