linux/arch/mips
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
..
alchemy
basler/excite
bcm47xx
boot
cobalt
configs
dec mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
emma2rh
fw
gt64120/wrppmc
include/asm mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
jazz
kernel
lasat
lemote/lm2e
lib
math-emu
mipssim
mm
mti-malta
nxp/pnx8550
oprofile
pci
pmc-sierra mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
rb532
sgi-ip22
sgi-ip27
sgi-ip32
sibyte mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
sni
txx9
vr41xx
Kconfig
Kconfig.debug
Makefile