summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 04:51:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 04:51:10 +0200
commit57eee9ae7bbcfb692dc96c739a5184adb6349733 (patch)
treedd268927f30b91e8cbf95ec58e6004673b71fe40 /init/main.c
parentMerge branch 'signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentoprofile: introduce module_param oprofile.cpu_type (diff)
downloadlinux-57eee9ae7bbcfb692dc96c739a5184adb6349733.tar.xz
linux-57eee9ae7bbcfb692dc96c739a5184adb6349733.zip
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
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions