diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:50:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:01:23 -0400 |
| commit | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch) | |
| tree | ade5aec66bc7ddb97048c4f141932de0f93369b9 /init/Kconfig | |
| parent | f5f29151588744ea2e283971cb0ad403ee04e3e2 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge tag 'v3.9-rc3' into next/multiplatform
Linux 3.9-rc3
Conflicts:
arch/arm/Kconfig
arch/arm/mach-spear/spear3xx.c
arch/arm/plat-spear/Kconfig
This is a dependency for ux500/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'init/Kconfig')
| -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 | ||