diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-12 10:33:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-12 10:33:21 +1100 |
| commit | ef9567531502dfc1b485973e3138eea6bcc54e12 (patch) | |
| tree | 061b748542816b229bd2a7784ebc39b64b8899e6 /init | |
| parent | ff2caa08251e660e6668ebed38cd83eb80e60cb7 (diff) | |
| parent | 9876d5e63528fa4b1e52848a618b002f27c16b70 (diff) | |
Merge commit 'sched/auto-sched-next'
Conflicts:
lib/Makefile
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 69d5190918e5..9d8cf2d2f840 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1026,7 +1026,6 @@ config SLABINFO config RT_MUTEXES boolean - select PLIST config BASE_SMALL int |