1
0
Fork 0
alistair23-linux/arch/ia64
Linus Torvalds 6556a67435 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits)
  perf_event, amd: Fix spinlock initialization
  perf_event: Fix preempt warning in perf_clock()
  perf tools: Flush maps on COMM events
  perf_events, x86: Split PMU definitions into separate files
  perf annotate: Handle samples not at objdump output addr boundaries
  perf_events, x86: Remove superflous MSR writes
  perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()
  perf_events, x86: AMD event scheduling
  perf_events: Add new start/stop PMU callbacks
  perf_events: Report the MMAP pgoff value in bytes
  perf annotate: Defer allocating sym_priv->hist array
  perf symbols: Improve debugging information about symtab origins
  perf top: Use a macro instead of a constant variable
  perf symbols: Check the right return variable
  perf/scripts: Tag syscall_name helper as not yet available
  perf/scripts: Add perf-trace-python Documentation
  perf/scripts: Remove unnecessary PyTuple resizes
  perf/scripts: Add syscall tracing scripts
  perf/scripts: Add Python scripting engine
  perf/scripts: Remove check-perf-trace from listed scripts
  ...

Fix trivial conflict in tools/perf/util/probe-event.c
2010-02-28 10:20:25 -08:00
..
configs sgi-gru: remove SGI_GRU as a valid config option for ia64 configs with SGI_UV 2009-04-02 19:05:07 -07:00
dig x86, ia64: convert to use generic dma_map_ops struct 2009-01-06 14:06:57 +01:00
hp [IA64] fix SBA IOMMU to handle allocation failure properly 2009-12-14 16:38:43 -08:00
ia32 elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
include/asm x86/PCI: use host bridge _CRS info by default on 2008 and newer machines 2010-02-23 09:43:42 -08:00
kernel kprobes: Disable booster when CONFIG_PREEMPT=y 2010-02-04 09:36:18 +01:00
kvm KVM: ia64: fix build breakage due to host spinlock change 2009-12-27 13:36:33 -02:00
lib [IA64] fix csum_ipv6_magic() 2009-09-02 09:14:48 -07:00
mm [IA64] __per_cpu_idtrs[] is a memory hog 2010-01-07 16:10:57 -08:00
oprofile [IA64] implement ticket locks for Itanium 2009-09-25 08:42:16 -07:00
pci PCI: augment bus resource table with a list 2010-02-23 09:43:37 -08:00
scripts ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization 2009-03-26 10:50:09 -07:00
sn [IA64] Fix broken sn2 build 2010-02-23 16:07:25 -08:00
uv [IA64] Simplify SGI uv vs. sn2 driver issues 2008-11-04 11:29:39 -08:00
xen percpu: make percpu symbols in xen unique 2009-10-29 22:34:13 +09:00
Kconfig ia64: convert to dynamic percpu allocator 2009-10-02 13:28:56 +09:00
Kconfig.debug [PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu 2005-11-07 07:53:35 -08:00
Makefile ia64: move nr-irqs.h to include/generated 2009-12-12 13:08:14 +01:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
module.lds Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00