summaryrefslogtreecommitdiffstats
path: root/init
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-022-3/+4
|\
| * init,cpuset: fix initialize orderLai Jiangshan2009-03-251-2/+1
| * Merge branch 'core/locking' into tracing/ftraceIngo Molnar2009-03-131-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 branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/coreIngo Molnar2009-03-041-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/coreIngo Molnar2009-02-242-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 branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/coreIngo Molnar2009-01-181-33/+32
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'v2.6.29-rc1' into tracing/urgentIngo Molnar2009-01-116-89/+141
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtrace2Ingo Molnar2009-01-062-33/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2Ingo Molnar2008-12-312-3/+94
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtraceIngo Molnar2008-12-312-3/+94
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tracing/kmemtrace: normalize the raw tracer event to the unified tracing APIFrederic Weisbecker2008-12-301-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'topic/kmemtrace' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2008-12-291-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | kmemtrace: Core implementation.Eduard - Gabriel Munteanu2008-12-291-0/+2
* | | | | | | | | | | | init/main.c: fix sparse warnings: context imbalanceHannes Eder2009-04-011-0/+1
* | | | | | | | | | | | cpumask: use set_cpu_active in init/main.cRusty Russell2009-03-301-2/+1
* | | | | | | | | | | | cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALLRusty Russell2009-03-301-1/+1
* | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30Linus Torvalds2009-03-281-15/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fastboot: remove duplicate unpack_to_rootfs()Li, Shaohua2009-03-281-15/+56
* | | | | | | | | | | | | Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2Ingo Molnar2009-03-274-222/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ \ \ \ 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 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
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge commit 'v2.6.29-rc7' into sched/coreIngo Molnar2009-03-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rcu: Teach RCU that idle task is not quiscent state at bootPaul E. McKenney2009-02-261-1/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/coreIngo Molnar2009-02-262-6/+12
|\| | | | | | | | | | |
| * | | | | | | | | | | Consolidate driver_probe_done() loops into one placeArjan van de Ven2009-02-212-6/+12
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |