linux/arch/sparc64
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
..
boot sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
kernel sparc64: use iommu_num_pages function in IOMMU code 2008-10-16 11:21:33 -07:00
lib sparc64: Implement IRQ stacks. 2008-08-12 18:33:56 -07:00
math-emu sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
mm sparc64: Kill sparse warnings in mm/init.h 2008-09-12 00:19:21 -07:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
prom sparc64: remove CVS keywords 2008-05-20 00:33:43 -07:00
Kconfig container freezer: implement freezer cgroup subsystem 2008-10-20 08:52:34 -07:00
Kconfig.debug sparc64: add ftrace support. 2008-05-23 22:36:13 +02:00
Makefile sparc64: Add __arch64__ to CHECKFLAGS 2008-09-11 23:14:52 -07:00
defconfig sparc64: Update defconfig. 2008-07-18 01:49:06 -07:00