From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2009 02:51:10 +0000 (-0700)
Subject: Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.31-rc1~402
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=57eee9ae7bbcfb692dc96c739a5184adb6349733;p=linux.git

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
---

57eee9ae7bbcfb692dc96c739a5184adb6349733