summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-111-1/+1
|\
| * Merge branch 'core/urgent' into core/rcuIngo Molnar2009-04-141-8/+38
| |\
| * | RCU: make treercu be defaultPaul E. McKenney2009-04-031-1/+1
* | | perf_counter: Turn off by defaultIngo Molnar2009-06-111-1/+0
* | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-04-291-0/+8
|\ \ \ | | |/ | |/|
| * | kbuild: make it possible for the linker to discard local symbols from vmlinuxDavid Howells2009-04-111-0/+8
* | | Merge commit 'v2.6.30-rc1' into perfcounters/coreIngo Molnar2009-04-081-2/+8
|\ \ \ | |/ /
| * | namespaces: mqueue namespace: adapt sysctlSerge E. Hallyn2009-04-071-0/+6
| * | namespaces: mqueue ns: move mqueue_mnt into struct ipc_namespaceSerge E. Hallyn2009-04-071-2/+2
* | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-04-071-1/+3
|\ \ \ | |/ /
| * | Make CONFIG_SLOW_WORK an automatic rather than manual config optionDavid Howells2009-04-061-1/+3
* | | perf_counter: hook up the tracepoint eventsPeter Zijlstra2009-04-061-0/+5
* | | Merge branch 'linus' into perfcounters/core-v2Ingo Molnar2009-04-061-21/+94
|\ \ \ | |/ /
| * | Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-051-1/+1
| |\ \
| | * \ Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-021-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-131-15/+15
| | | |\
| | | * \ Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-061-0/+60
| | | |\ \
| | | * | | tracing/markers: make markers select tracepointsFrederic Weisbecker2009-02-201-1/+1
| * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-04-031-4/+4
| |\ \ \ \ \
| | * | | | | trivial: fix where cgroup documentation is not correctly referred toThadeu Lima de Souza Cascardo2009-03-301-1/+1
| | * | | | | trivial: fix typos/grammar errors in Kconfig textsMatt LaPlante2009-03-301-3/+3
| | |/ / / /
| * | | | | Create a dynamically sized pool of threads for doing very slow work itemsDavid Howells2009-04-031-0/+12
| * | | | | cpusets: allow cpusets to be configured/built on non-SMP systemsPaul Menage2009-04-021-1/+1
| * | | | | memcg: remove redundant message at swaponKAMEZAWA Hiroyuki2009-04-021-0/+2
| |/ / / /
| * | | | Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-271-0/+60
| |\ \ \ \ | | | |/ / | | |/| |
| | | | |
| | | \ \
| | *-. \ \ Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x...Ingo Molnar2009-03-041-0/+60
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch 'linus' into x86/setup-lzmaIngo Molnar2009-01-101-84/+112
| | | |\ \ \
| | | * | | | bzip2/lzma: make config machinery an arch configurableH. Peter Anvin2009-01-041-21/+31
| | | * | | | bzip2/lzma: config and initramfs support for bzip2/lzma decompressionAlain Knaff2009-01-041-0/+50
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/coreIngo Molnar2009-03-131-15/+15
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | menu: fix embedded menu snafuRandy Dunlap2009-03-101-15/+15
| | | | |_|/ | | | |/| |
| | | * | | Revert "menu: fix embedded menu snafu"Linus Torvalds2009-03-021-16/+12
| | | * | | menu: fix embedded menu snafuRandy Dunlap2009-03-021-12/+16
| | |/ / /
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'sched/rt' and 'sched/urgent' into sched/coreIngo Molnar2009-02-081-128/+132
| |\ \ \ \ \ | | | |/ / / | | | | | / | | |_|_|/ | |/| | |
| | * | | sched: make plist a library facilityPeter Zijlstra2009-01-161-1/+0
| |/ / /
* | | | Merge commit 'v2.6.29-rc4' into perfcounters/coreIngo Molnar2009-02-111-94/+100
|\ \ \ \ | | |/ / | |/| |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesLinus Torvalds2009-01-261-7/+0
| |\ \ \
| | * | | Revert "kbuild: strip generated symbols from *.ko"Sam Ravnborg2009-01-141-7/+0
| | |/ /
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-01-261-0/+8
| |\ \ \
| | * | | net: Move config NET_NS to from net/Kconfig to init/KconfigMatt Helsley2009-01-261-0/+8
| * | | | Merge branch 'core/debugobjects' into core/urgentThomas Gleixner2009-01-221-33/+32
| |\ \ \ \ | | |/ / /
| * | | | rcu: move Kconfig menuMike Travis2009-01-151-87/+92
| | |/ / | |/| |
* | | | Merge commit 'v2.6.29-rc2' into perfcounters/coreIngo Molnar2009-01-211-33/+32
|\ \ \ \ | | |/ / | |/| |
| * | | cgroups: consolidate cgroup documentsLi Zefan2009-01-151-5/+4
| * | | cgroups: clean up KconfigLi Zefan2009-01-151-28/+28
| |/ /
* | | Merge commit 'v2.6.29-rc1' into perfcounters/coreIngo Molnar2009-01-111-87/+204
|\ \ \ | |/ /
| * | memcg: mem+swap controller KconfigKAMEZAWA Hiroyuki2009-01-081-0/+17
| * | memcg: fix a typo in KconfigLi Zefan2009-01-081-1/+1
| * | cgroups: make cgroup config a submenuKAMEZAWA Hiroyuki2009-01-081-56/+67
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds2009-01-061-17/+27
| |\ \
OpenPOWER on IntegriCloud