tree dd268927f30b91e8cbf95ec58e6004673b71fe40
parent 8f40642ad315c553bab4ae800766ade07e574a77
parent 7e4e0bd50e80df2fe5501f48f872448376cdd997
author Linus Torvalds <torvalds@linux-foundation.org> 1244688670 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244688670 -0700

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: introduce module_param oprofile.cpu_type
  oprofile: add support for Core i7 and Atom
  oprofile: remove undocumented oprofile.p4force option
  oprofile: re-add force_arch_perfmon option