diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-30 12:19:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-30 12:28:50 +0200 |
| commit | 0d15504f16f68725e4635aa85411015d1c573b0a (patch) | |
| tree | 748d75062849f1c3ada597715ea4125063c57c48 /arch/arm/kernel/process.c | |
| parent | Merge commit 'v2.6.27-rc8' into oprofile (diff) | |
| parent | Merge commit 'v2.6.27-rc5' into tip/oprofile (diff) | |
| download | linux-0d15504f16f68725e4635aa85411015d1c573b0a.tar.xz linux-0d15504f16f68725e4635aa85411015d1c573b0a.zip | |
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/kernel/process.c')
0 files changed, 0 insertions, 0 deletions