aboutsummaryrefslogtreecommitdiffstats
path: root/init
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-01-071-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | trivial: add missing printk loglevel in start_kernelRon Lee2009-01-061-1/+2
| * | | 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
| | |/ /
| * | | init/main.c: mark late_time_init as __initdataJan Beulich2009-01-061-1/+1
| * | | autodetect_raid: add missing __init markingMike Frysinger2009-01-061-1/+1
| * | | Remove remaining unwinder codeAlexey Dobriyan2009-01-061-3/+0
| * | | do_mounts: add device info to mount messageMarton Balint2009-01-061-2/+2
| * | | init: properly placing noinline keywordRakib Mullick2009-01-061-2/+2
| * | | shmem: unify regular and tiny shmemMatt Mackall2009-01-061-4/+0
| |/ /
* | | Merge branch 'linus' into tracing/kmemtrace2Ingo Molnar2009-01-062-33/+13
|\ \ \ | |/ /
| * | remove CONFIG_KMODJohannes Berg2009-01-051-6/+0
| |/
| * Merge branch 'cpus4096-for-linus-3' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2009-01-031-9/+4
| |\
| | * cpumask: Use find_last_bit()Rusty Russell2009-01-011-6/+1
| | * cpumask: Use accessors code in coreRusty Russell2009-01-011-3/+3
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Rusty Russell2008-12-312-3/+94
| | |\
| | * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Rusty Russell2008-12-302-15/+29
| | |\ \
| * | \ \ 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-132-15/+32
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | | | |
| | | | \ \
| | | | \ \
| | | | \ \
| | | *---. \ \ Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096Ingo Molnar2008-12-121-0/+11
| | | |\ \ \ \ \
| | * | | | | | | cpumask: centralize cpu_online_map and cpu_possible_mapRusty Russell2008-12-131-0/+9
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | kbuild: Remove gcc 4.1.0 quirk from init/main.cIngo Molnar2009-01-021-9/+0
| * | | | | | | Merge branch 'irq-fixes-for-linus-4' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-12-311-9/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | sparseirq: move __weak symbols into separate compilation unitYinghai Lu2008-12-291-10/+0
| | * | | | | | sparseirq: work around compiler optimizing away __weak functionsYinghai Lu2008-12-271-3/+4
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2Ingo Molnar2008-12-312-3/+94
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'linus' into tracing/kmemtraceIngo Molnar2008-12-312-3/+94
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-301-0/+11
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-081-0/+11
| | | |/ / / /
| | * | | | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-301-3/+83
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |