commit d25e8dbdab203ed8b4fd0a174bb5259e35ecd87c
author Linus Torvalds <torvalds@linux-foundation.org> Sun Feb 28 10:15:31 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Feb 28 10:15:31 2010 -0800
tree 46aadc89806daebe509f35daa962114b7a730090
parent 642c4c75a765d7a3244ab39c8e6fb09be21eca5b
parent cfc9c0b450176a077205ef39092f0dc1a04e020a

Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile/x86: fix msr access to reserved counters
  oprofile/x86: use kzalloc() instead of kmalloc()
  oprofile/x86: fix perfctr nmi reservation for mulitplexing
  oprofile/x86: add comment to counter-in-use warning
  oprofile/x86: warn user if a counter is already active
  oprofile/x86: implement randomization for IBS periodic op counter
  oprofile/x86: implement lsfr pseudo-random number generator for IBS
  oprofile/x86: implement IBS cpuid feature detection
  oprofile/x86: remove node check in AMD IBS initialization
  oprofile/x86: remove OPROFILE_IBS config option
  oprofile: remove EXPERIMENTAL from the config option description
  oprofile: remove tracing build dependency