linux-stable-rt/arch/ia64/kernel
Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
2009-04-05 11:04:19 -07:00
..
cpufreq
.gitignore
Makefile Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
Makefile.gate
acpi-ext.c
acpi-processor.c
acpi.c Pull cpumask into release branch 2009-03-31 14:24:52 -07:00
asm-offsets.c
audit.c
brl_emu.c
crash.c
crash_dump.c
cyclone.c
dma-mapping.c
efi.c
efi_stub.S
entry.S Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
entry.h
err_inject.c
esi.c
esi_stub.S
fsys.S
fsyscall_gtod_data.h
ftrace.c
gate-data.S
gate.S
gate.lds.S
head.S
ia64_ksyms.c
init_task.c
iosapic.c
irq.c
irq_ia64.c
irq_lsapic.c
ivt.S
jprobes.S
kprobes.c
machine_kexec.c
machvec.c
mca.c
mca_asm.S
mca_drv.c
mca_drv.h
mca_drv_asm.S
minstate.h
module.c [IA64] BUG to BUG_ON changes 2009-04-01 09:50:48 -07:00
msi_ia64.c
nr-irqs.c
numa.c
pal.S
palinfo.c
paravirt.c
paravirt_inst.h
paravirt_patch.c
paravirt_patchlist.c
paravirt_patchlist.h
paravirtentry.S
patch.c
pci-dma.c
pci-swiotlb.c
perfmon.c Pull cpumask into release branch 2009-03-31 14:24:52 -07:00
perfmon_default_smpl.c
perfmon_generic.h
perfmon_itanium.h
perfmon_mckinley.h
perfmon_montecito.h
process.c Simplify copy_thread() 2009-04-02 19:04:51 -07:00
ptrace.c
relocate_kernel.S
sal.c
salinfo.c
setup.c [IA64] BUG to BUG_ON changes 2009-04-01 09:50:48 -07:00
sigframe.h
signal.c
smp.c
smpboot.c
sys_ia64.c
time.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 2009-04-01 13:33:41 -07:00
topology.c
traps.c
unaligned.c
uncached.c
unwind.c
unwind_decoder.c
unwind_i.h
vmlinux.lds.S Pull pvops into release branch 2009-03-31 14:25:08 -07:00