diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-04-24 14:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-04-24 14:33:54 -0400 |
| commit | 6402c7dc2a19c19bd8cdc7d80878b850da418942 (patch) | |
| tree | cda2ea2df40442e2aa016119f3548cc504127ea8 /init | |
| parent | 77c675ba18836802f6b73d2d773481d06ebc0f04 (diff) | |
| parent | 60d509fa6a9c4653a86ad830e4c4b30360b23f0e (diff) | |
Merge branch 'linus' into timers/core
Reason: Get upstream fixes before adding conflicting code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 22616cd434bc..5341d7232c3a 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -28,10 +28,6 @@ config BUILDTIME_EXTABLE_SORT | |||
| 28 | 28 | ||
| 29 | menu "General setup" | 29 | menu "General setup" |
| 30 | 30 | ||
| 31 | config EXPERIMENTAL | ||
| 32 | bool | ||
| 33 | default y | ||
| 34 | |||
| 35 | config BROKEN | 31 | config BROKEN |
| 36 | bool | 32 | bool |
| 37 | 33 | ||