diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-10 06:46:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 06:46:51 -0400 |
| commit | 1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 (patch) | |
| tree | ec5af7a70f58ad27ad21fc27815ca164ccf92c36 /arch/mn10300/Kconfig | |
| parent | dcef788eb9659b61a2110284fcce3ca6e63480d2 (diff) | |
| parent | 93cfb3c9fd83d877a8f1ffad9ff862b617b32828 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
and pick up the current lineup of tracing/urgent fixes as well
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/Kconfig')
| -rw-r--r-- | arch/mn10300/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 41d16822e616..355926730e8d 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
| @@ -370,5 +370,3 @@ source "security/Kconfig" | |||
| 370 | source "crypto/Kconfig" | 370 | source "crypto/Kconfig" |
| 371 | 371 | ||
| 372 | source "lib/Kconfig" | 372 | source "lib/Kconfig" |
| 373 | |||
| 374 | source "arch/mn10300/oprofile/Kconfig" | ||