Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-12-31 | Merge commit 'boot-params/master' | Stephen Rothwell | |
Conflicts: arch/arm/kernel/setup.c arch/parisc/kernel/setup.c arch/sh/boards/mach-microdev/setup.c arch/sh/boards/mach-migor/setup.c arch/x86/kernel/cpu/common.c | |||
2008-12-31 | Merge commit 'nommu/master' | Stephen Rothwell | |
Conflicts: kernel/fork.c | |||
2008-12-31 | Merge commit 'jc_docs/docs-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'fuse/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'fatfs/master' | Stephen Rothwell | |
2008-12-31 | Merge commit 'osd/linux-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'cputime/cputime' | Stephen Rothwell | |
Conflicts: kernel/sched.c | |||
2008-12-31 | Merge commit 'dwmw2-iommu/master' | Stephen Rothwell | |
2008-12-31 | Merge commit 'proc/proc' | Stephen Rothwell | |
2008-12-31 | Merge commit 'watchdog/master' | Stephen Rothwell | |
2008-12-31 | Merge commit 'uwb/for-upstream' | Stephen Rothwell | |
Conflicts: drivers/uwb/wlp/eda.c | |||
2008-12-31 | Merge commit 'iommu/auto-iommu-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'sparseirq/auto-sparseirq-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'oprofile/auto-oprofile-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'agp/agp-next' | Stephen Rothwell | |
2008-12-31 | Merge branch 'quilt/ttydev' | Stephen Rothwell | |
Conflicts: fs/devpts/inode.c | |||
2008-12-31 | Merge commit 'lblnet/master' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt | |||
2008-12-31 | Merge commit 'voltage/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'drm/drm-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'mfd/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'kmemcheck/auto-kmemcheck-next' | Stephen Rothwell | |
Conflicts: arch/x86/mm/Makefile mm/Makefile mm/slub.c | |||
2008-12-31 | Merge commit 'md/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'slab/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'kgdb/kgdb-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'backlight/for-mm' | Stephen Rothwell | |
2008-12-31 | Merge commit 'leds/for-mm' | Stephen Rothwell | |
2008-12-31 | Merge commit 'firmware/master' | Stephen Rothwell | |
Conflicts: drivers/net/tg3.c firmware/Makefile firmware/WHENCE | |||
2008-12-31 | Merge commit 'block/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'ubifs/linux-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'bkl-removal/bkl-removal' | Stephen Rothwell | |
Conflicts: fs/ioctl.c | |||
2008-12-31 | Merge commit 'gfs2/master' | Stephen Rothwell | |
2008-12-31 | Merge commit 'mmc/next' | Stephen Rothwell | |
2008-12-31 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: kernel/rcuclassic.c | |||
2008-12-31 | Merge commit 'rr_cpumask/master' | Stephen Rothwell | |
Conflicts: kernel/sched.c | |||
2008-12-31 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'sound/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'mtd/master' | Stephen Rothwell | |
Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c | |||
2008-12-31 | Merge commit 'udf/for_next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'async_tx/next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'ext4/next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'ocfs2/linux-next' | Stephen Rothwell | |
Conflicts: fs/ocfs2/namei.c | |||
2008-12-31 | Merge commit 'scsi/master' | Stephen Rothwell | |
2008-12-31 | Merge commit 'dlm/next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'ubi/linux-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'nfsd/nfsd-next' | Stephen Rothwell | |
Conflicts: fs/lockd/host.c fs/lockd/mon.c | |||
2008-12-31 | Merge commit 'acpi/test' | Stephen Rothwell | |
2008-12-31 | Merge commit 'infiniband/for-next' | Stephen Rothwell | |
2008-12-31 | Merge commit 'xfs/master' | Stephen Rothwell | |
2008-12-31 | Merge commit 'nfs/linux-next' | Stephen Rothwell | |