summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
| |\ \
| | * | sysfs: clarify SYSFS_DEPRECATED help textKay Sievers2009-01-061-17/+27
| * | | shmem: unify regular and tiny shmemMatt Mackall2009-01-061-4/+0
| |/ /
| * | remove CONFIG_KMODJohannes Berg2009-01-051-6/+0
| |/
| * Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2009-01-021-0/+9
| |\
| | * Merge ../linux-2.6-x86Rusty Russell2008-12-131-0/+1
| | |\
| | * | cpumask: centralize cpu_online_map and cpu_possible_mapRusty Russell2008-12-131-0/+9
| * | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-301-3/+83
| |\ \ \
| | * | | rcu: provide RCU options on non-preempt architectures tooIngo Molnar2008-12-251-0/+74
| | * | | "Tree RCU": scalable classic RCU implementationPaul E. McKenney2008-12-181-6/+12
| | |/ /
* | | | Merge branch 'linus' into perfcounters/coreIngo Molnar2008-12-291-0/+8
|\ \ \ \ | |/ / /
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-nextLinus Torvalds2008-12-281-0/+7
| |\ \ \ | | |_|/ | |/| |
| | * | allow stripping of generated symbols under CONFIG_KALLSYMS_ALLJan Beulich2008-12-191-0/+7
| | |/
| | |
| | \
| *-. \ Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-191-4/+4
| |\ \ \ | | | |/
| * | | markers: auto enable tracepoints (new API : trace_mark_tp())Mathieu Desnoyers2008-11-161-0/+1
| |/ /
* | | perfcounters: select ANON_INODESIngo Molnar2008-12-081-0/+1
* | | performance counters: core codeThomas Gleixner2008-12-081-0/+29
| |/ |/|
* | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-11-181-1/+1
|\ \
| * | sched: correct sched-rt-group.txt pathname in init/KconfigAdrian Knoth2008-11-131-1/+1
| |/
* | Kconfig: SLUB is the default slab allocatorSimon Arlott2008-11-131-3/+3
|/
* memcg: update menuconfig help textKAMEZAWA Hiroyuki2008-10-301-6/+10
* PCI: PCI_QUIRKS depends on PCIGeert Uytterhoeven2008-10-221-1/+2
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2008-10-201-0/+8
|\
| * PCI: allow quirks to be compiled outThomas Petazzoni2008-10-201-0/+8
* | Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-201-0/+7
|\ \ | |/ |/|
OpenPOWER on IntegriCloud