linux-stable-rt/drivers/oprofile
Linus Torvalds 92fb83afd6 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: (21 commits)
  OProfile: Fix buffer synchronization for IBS
  oprofile: hotplug cpu fix
  oprofile: fixing whitespaces in arch/x86/oprofile/*
  oprofile: fixing whitespaces in arch/x86/oprofile/*
  oprofile: fixing whitespaces in drivers/oprofile/*
  x86/oprofile: add the logic for enabling additional IBS bits
  x86/oprofile: reordering functions in nmi_int.c
  x86/oprofile: removing unused function parameter in add_ibs_begin()
  oprofile: more whitespace fixes
  oprofile: whitespace fixes
  OProfile: Rename IBS sysfs dir into "ibs_op"
  OProfile: Rework string handling in setup_ibs_files()
  OProfile: Rework oprofile_add_ibs_sample() function
  oprofile: discover counters for op ppro too
  oprofile: Implement Intel architectural perfmon support
  oprofile: Don't report Nehalem as core_2
  oprofile: drop const in num counters field
  Revert "Oprofile Multiplexing Patch"
  x86, oprofile: BUG: using smp_processor_id() in preemptible code
  x86/oprofile: fix on_each_cpu build error
  ...

Manually fixed trivial conflicts in
	drivers/oprofile/{cpu_buffer.c,event_buffer.h}
2008-10-23 10:05:40 -07:00
..
buffer_sync.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile 2008-10-23 10:05:40 -07:00
buffer_sync.h oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
cpu_buffer.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile 2008-10-23 10:05:40 -07:00
cpu_buffer.h oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
event_buffer.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
event_buffer.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile 2008-10-23 10:05:40 -07:00
oprof.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprof.h oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofile_files.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofile_stats.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofile_stats.h oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofilefs.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
timer_int.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00