Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge branch 'core/locking' into tracing/ftrace | Ingo Molnar | 2009-03-13 | 1 | -15/+15 | |
|\ | ||||||
| * | menu: fix embedded menu snafu | Randy Dunlap | 2009-03-10 | 1 | -15/+15 | |
* | | Merge branch 'x86/core' into tracing/textedit | Ingo Molnar | 2009-03-06 | 4 | -222/+157 | |
|\ \ | ||||||
| * | | Merge branch 'x86/urgent' into x86/core | Ingo Molnar | 2009-03-05 | 1 | -1/+2 | |
| |\| | ||||||
| | \ | ||||||
| | \ | ||||||
| | \ | ||||||
| | \ | ||||||
| *---. \ | Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x... | Ingo Molnar | 2009-03-04 | 3 | -216/+144 | |
| |\ \ \ \ | ||||||
| | | | * | | Revert "menu: fix embedded menu snafu" | Linus Torvalds | 2009-03-02 | 1 | -16/+12 | |
| | | | * | | menu: fix embedded menu snafu | Randy Dunlap | 2009-03-02 | 1 | -12/+16 | |
| | | * | | | init: make initrd/initramfs decompression failure a KERN_EMERG event | H. Peter Anvin | 2009-01-14 | 2 | -5/+9 | |
| | | * | | | bzip2/lzma: comprehensible error messages for missing decompressor | H. Peter Anvin | 2009-01-12 | 2 | -2/+15 | |
| | | * | | | bzip2/lzma: make flush_buffer() unconditional | Ingo Molnar | 2009-01-10 | 1 | -2/+0 | |
| | | * | | | Merge branch 'linus' into x86/setup-lzma | Ingo Molnar | 2009-01-10 | 6 | -95/+141 | |
| | | |\ \ \ | ||||||
| | | * | | | | bzip2/lzma: centralize format detection | H. Peter Anvin | 2009-01-08 | 2 | -63/+14 | |
| | | * | | | | bzip2/lzma: fix built-in initramfs vs CONFIG_RD_GZIP | Alain Knaff | 2009-01-07 | 1 | -1/+6 | |
| | | * | | | | bzip2/lzma: make config machinery an arch configurable | H. Peter Anvin | 2009-01-04 | 1 | -21/+31 | |
| | | * | | | | bzip2/lzma: use a table to search for initramfs compression formats | H. Peter Anvin | 2009-01-04 | 1 | -47/+35 | |
| | | * | | | | bzip2/lzma: config and initramfs support for bzip2/lzma decompression | Alain Knaff | 2009-01-04 | 3 | -198/+157 | |
| * | | | | | | Merge branch 'linus' into x86/apic | Ingo Molnar | 2009-02-22 | 2 | -6/+12 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | ||||||
| * | | | | | smp, generic: introduce arch_disable_smp_support() instead of disable_ioapic_... | Ingo Molnar | 2009-02-05 | 1 | -6/+6 | |
| * | | | | | Merge branch 'linus' into core/percpu | Ingo Molnar | 2009-01-27 | 1 | -94/+100 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'x86/mm' into core/percpu | Ingo Molnar | 2009-01-21 | 1 | -33/+32 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'core/percpu' into stackprotector | Ingo Molnar | 2009-01-18 | 6 | -122/+154 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'linus' into stackprotector | Ingo Molnar | 2008-12-31 | 5 | -38/+233 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'linus' into stackprotector | Ingo Molnar | 2008-10-15 | 9 | -163/+121 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | x86: fix the stackprotector canary of the boot CPU | Ingo Molnar | 2008-05-26 | 1 | -0/+6 | |
| * | | | | | | | | | stackprotector: include files | Ingo Molnar | 2008-05-26 | 1 | -0/+1 | |
* | | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core | Ingo Molnar | 2009-03-04 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | rcu: Teach RCU that idle task is not quiscent state at boot | Paul E. McKenney | 2009-02-26 | 1 | -1/+2 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core | Ingo Molnar | 2009-02-24 | 2 | -6/+12 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Consolidate driver_probe_done() loops into one place | Arjan van de Ven | 2009-02-21 | 2 | -6/+12 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | tracing/markers: make markers select tracepoints | Frederic Weisbecker | 2009-02-20 | 1 | -1/+1 | |
* | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing... | Ingo Molnar | 2009-02-03 | 1 | -94/+100 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes | Linus Torvalds | 2009-01-26 | 1 | -7/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Revert "kbuild: strip generated symbols from *.ko" | Sam Ravnborg | 2009-01-14 | 1 | -7/+0 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 | Linus Torvalds | 2009-01-26 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | net: Move config NET_NS to from net/Kconfig to init/Kconfig | Matt Helsley | 2009-01-26 | 1 | -0/+8 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'core/debugobjects' into core/urgent | Thomas Gleixner | 2009-01-22 | 1 | -33/+32 | |
| |\| | | | | | | ||||||
| * | | | | | | | rcu: move Kconfig menu | Mike Travis | 2009-01-15 | 1 | -87/+92 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core | Ingo Molnar | 2009-01-18 | 1 | -33/+32 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | cgroups: consolidate cgroup documents | Li Zefan | 2009-01-15 | 1 | -5/+4 | |
| * | | | | | | cgroups: clean up Kconfig | Li Zefan | 2009-01-15 | 1 | -28/+28 | |
| |/ / / / / | ||||||
* | | | | | | Merge commit 'v2.6.29-rc1' into tracing/urgent | Ingo Molnar | 2009-01-11 | 6 | -89/+141 | |
|\| | | | | | ||||||
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus | Linus Torvalds | 2009-01-09 | 1 | -0/+14 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Squashfs: initrd support | Phillip Lougher | 2009-01-05 | 1 | -0/+14 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu | Linus Torvalds | 2009-01-09 | 1 | -0/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | NOMMU: Support XIP on initramfs | David Howells | 2009-01-08 | 1 | -0/+1 | |
| * | | | | | | memcg: mem+swap controller Kconfig | KAMEZAWA Hiroyuki | 2009-01-08 | 1 | -0/+17 | |
| * | | | | | | memcg: fix a typo in Kconfig | Li Zefan | 2009-01-08 | 1 | -1/+1 | |
| * | | | | | | cgroups: make cgroup config a submenu | KAMEZAWA Hiroyuki | 2009-01-08 | 1 | -56/+67 | |
| |/ / / / / | ||||||
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async | Linus Torvalds | 2009-01-07 | 2 | -1/+6 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | async: Asynchronous function calls to speed up kernel boot | Arjan van de Ven | 2009-01-07 | 2 | -1/+6 |