aboutsummaryrefslogtreecommitdiffstats
path: root/init
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-131-15/+15
|\
| * menu: fix embedded menu snafuRandy Dunlap2009-03-101-15/+15
* | Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-064-222/+157
|\ \
| * \ Merge branch 'x86/urgent' into x86/coreIngo Molnar2009-03-051-1/+2
| |\ \ | | |/
| | |
| | \
| | \
| | \
| *---. \ Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x...Ingo Molnar2009-03-043-216/+144
| |\ \ \ \
| | | | * | Revert "menu: fix embedded menu snafu"Linus Torvalds2009-03-021-16/+12
| | | | * | menu: fix embedded menu snafuRandy Dunlap2009-03-021-12/+16
| | | * | | init: make initrd/initramfs decompression failure a KERN_EMERG eventH. Peter Anvin2009-01-142-5/+9
| | | * | | bzip2/lzma: comprehensible error messages for missing decompressorH. Peter Anvin2009-01-122-2/+15
| | | * | | bzip2/lzma: make flush_buffer() unconditionalIngo Molnar2009-01-101-2/+0
| | | * | | Merge branch 'linus' into x86/setup-lzmaIngo Molnar2009-01-106-95/+141
| | | |\ \ \
| | | * | | | bzip2/lzma: centralize format detectionH. Peter Anvin2009-01-082-63/+14
| | | * | | | bzip2/lzma: fix built-in initramfs vs CONFIG_RD_GZIPAlain Knaff2009-01-071-1/+6
| | | * | | | bzip2/lzma: make config machinery an arch configurableH. Peter Anvin2009-01-041-21/+31
| | | * | | | bzip2/lzma: use a table to search for initramfs compression formatsH. Peter Anvin2009-01-041-47/+35
| | | * | | | bzip2/lzma: config and initramfs support for bzip2/lzma decompressionAlain Knaff2009-01-043-198/+157
| * | | | | | Merge branch 'linus' into x86/apicIngo Molnar2009-02-222-6/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| * | | | | smp, generic: introduce arch_disable_smp_support() instead of disable_ioapic_...Ingo Molnar2009-02-051-6/+6
| * | | | | Merge branch 'linus' into core/percpuIngo Molnar2009-01-271-94/+100
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'x86/mm' into core/percpuIngo Molnar2009-01-211-33/+32
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'core/percpu' into stackprotectorIngo Molnar2009-01-186-122/+154
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'linus' into stackprotectorIngo Molnar2008-12-315-38/+233
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'linus' into stackprotectorIngo Molnar2008-10-159-163/+121
| |\ \ \ \ \ \ \ \
| * | | | | | | | | x86: fix the stackprotector canary of the boot CPUIngo Molnar2008-05-261-0/+6
| * | | | | | | | | stackprotector: include filesIngo Molnar2008-05-261-0/+1
* | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/coreIngo Molnar2009-03-041-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | rcu: Teach RCU that idle task is not quiscent state at bootPaul E. McKenney2009-02-261-1/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/coreIngo Molnar2009-02-242-6/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Consolidate driver_probe_done() loops into one placeArjan van de Ven2009-02-212-6/+12
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | tracing/markers: make markers select tracepointsFrederic Weisbecker2009-02-201-1/+1
* | | | | | | | Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing...Ingo Molnar2009-02-031-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 branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/coreIngo Molnar2009-01-181-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 tracing/urgentIngo Molnar2009-01-116-89/+141
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds2009-01-091-0/+14
| |\ \ \ \ \
| | * | | | | Squashfs: initrd supportPhillip Lougher2009-01-051-0/+14
| | | |_|_|/ | | |/| | |
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommuLinus Torvalds2009-01-091-0/+1
| |\ \ \ \ \
| | * | | | | NOMMU: Support XIP on initramfsDavid Howells2009-01-081-0/+1
| * | | | | | 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/arjan/linux-2.6-asyncLinus Torvalds2009-01-072-1/+6
| |\ \ \ \ \
| | * | | | | async: Asynchronous function calls to speed up kernel bootArjan van de Ven2009-01-072-1/+6