diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /init/Kconfig | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 38396ec7ee36..14c483d2b7c9 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1026,7 +1026,6 @@ config SLABINFO | |||
| 1026 | 1026 | ||
| 1027 | config RT_MUTEXES | 1027 | config RT_MUTEXES |
| 1028 | boolean | 1028 | boolean |
| 1029 | select PLIST | ||
| 1030 | 1029 | ||
| 1031 | config BASE_SMALL | 1030 | config BASE_SMALL |
| 1032 | int | 1031 | int |