Merge commit 'v2.6.29-rc1' into x86/urgent

Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
include/linux/kernel_stat.h

Merge branch 'linus' into core/iommu

Merge branch 'linus' into x86/cleanups

Merge branch 'linus' into x86/setup-lzma

Conflicts:
init/do_mounts_rd.c

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (31 commits)
powerpc/oprofile:

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (31 commits)
powerpc/oprofile: fix whitespaces in op_model_cell.c
powerpc/oprofile: IBM CELL: add SPU event profiling support
powerpc/oprofile: fix cell/pr_util.h
powerpc/oprofile: IBM CELL: cleanup and restructuring
oprofile: make new cpu buffer functions part of the api
oprofile: remove #ifdef CONFIG_OPROFILE_IBS in non-ibs code
ring_buffer: fix ring_buffer_event_length()
oprofile: use new data sample format for ibs
oprofile: add op_cpu_buffer_get_data()
oprofile: add op_cpu_buffer_add_data()
oprofile: rework implementation of cpu buffer events
oprofile: modify op_cpu_buffer_read_entry()
oprofile: add op_cpu_buffer_write_reserve()
oprofile: rename variables in add_ibs_begin()
oprofile: rename add_sample() in cpu_buffer.c
oprofile: rename variable ibs_allowed to has_ibs in op_model_amd.c
oprofile: making add_sample_entry() inline
oprofile: remove backtrace code for ibs
oprofile: remove unused ibs macro
oprofile: remove unused components in struct oprofile_cpu_buffer
...

show more ...

Merge branch 'oprofile/cell' into oprofile/oprofile-for-tip

powerpc/oprofile: IBM CELL: add SPU event profiling support

This patch adds the SPU event based profiling funcitonality for the
IBM Cell processor. Previously, the CELL OProfile kernel code support

powerpc/oprofile: IBM CELL: add SPU event profiling support

This patch adds the SPU event based profiling funcitonality for the
IBM Cell processor. Previously, the CELL OProfile kernel code supported
PPU event, PPU cycle profiling and SPU cycle profiling. The addition of
SPU event profiling allows the users to identify where in their SPU code
various SPU evnets are occuring. This should help users further identify
issues with their code. Note, SPU profiling has some limitations due to HW
constraints. Only one event at a time can be used for profiling and SPU event
profiling must be time sliced across all of the SPUs in a node.

The patch adds a new arch specific file to the OProfile file system. The
file has bit 0 set to indicate that the kernel supports SPU event profiling.
The user tool must check this file/bit to make sure the kernel supports
SPU event profiling before trying to do SPU event profiling. The user tool
check is part of the user tool patch for SPU event profiling.

Signed-off-by: Carl Love <carll@us.ibm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>

show more ...

Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h

Merge commit 'v2.6.27-rc8' into genirq

Merge branch 'x86/oprofile' into oprofile

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/asm-arm/arch-omap/onenand.h

Merge branch 'linus' into oprofile-v2

Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h

Merge commit 'v2.6.27-rc8' into x86/setup

Merge commit 'v2.6.27-rc7' into x86/microcode

Merge commit 'v2.6.27-rc7' into x86/pebs

Merge commit 'v2.6.27-rc7' into x86/debug

Merge commit 'v2.6.27-rc6' into timers/hpet

Merge branch 'master' into next

Merge branch 'linus' into x86/doc

Merge branch 'linus' into x86/xen

Merge branch 'linus' into x86/gart

Merge branch 'linus' into x86/tracehook

Conflicts:
arch/x86/Kconfig

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

Merge branch 'linus' into x86/cpu