Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-03-25 | Merge branch 'quilt/staging' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/usb' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: drivers/media/video/v4l2-device.c drivers/net/wimax/i2400m/usb-notif.c drivers/sh/maple/maple.c | |||
2009-03-25 | Merge commit 'suspend/linux-next' | Stephen Rothwell | |
Conflicts: drivers/xen/manage.c | |||
2009-03-25 | Merge commit 'kmemleak/kmemleak' | Stephen Rothwell | |
Conflicts: Documentation/kernel-parameters.txt MAINTAINERS include/linux/percpu.h init/main.c kernel/module.c lib/Kconfig.debug mm/slob.c mm/vmalloc.c | |||
2009-03-25 | Merge commit 'trivial/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'proc/proc' | Stephen Rothwell | |
Conflicts: security/selinux/hooks.c | |||
2009-03-25 | Merge commit 'watchdog/master' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/ttydev' | Stephen Rothwell | |
2009-03-25 | Merge commit 'security-testing/next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'voltage/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'drm/drm-next' | Stephen Rothwell | |
Conflicts: drivers/gpu/drm/drm_proc.c | |||
2009-03-25 | Merge commit 'mfd/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'md/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'backlight/for-mm' | Stephen Rothwell | |
2009-03-25 | Merge commit 'leds/for-mm' | Stephen Rothwell | |
2009-03-25 | Merge commit 'battery/master' | Stephen Rothwell | |
2009-03-25 | Merge commit 'firmware/master' | Stephen Rothwell | |
Conflicts: firmware/Makefile firmware/WHENCE sound/isa/Kconfig | |||
2009-03-25 | Merge commit 'block/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'bkl-removal/bkl-removal' | Stephen Rothwell | |
2009-03-25 | Merge commit 'input/next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'mmc/next' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: arch/powerpc/kernel/irq.c arch/powerpc/kernel/sysfs.c arch/x86/include/asm/topology.h arch/x86/kernel/cpu/cpufreq/powernow-k8.c arch/x86/kernel/cpu/cpufreq/speedstep-ich.c arch/x86/kernel/cpu/cpufreq/speedstep-lib.c arch/x86/lguest/boot.c arch/x86/mach-default/setup.c arch/x86/mach-voyager/setup.c drivers/firmware/dcdbas.c drivers/hid/hid-core.c drivers/media/video/saa7134/saa7134-core.c drivers/media/video/saa7134/saa7134.h drivers/net/virtio_net.c kernel/module.c | |||
2009-03-25 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
Conflicts: arch/x86/include/asm/timer.h | |||
2009-03-25 | Merge commit 'mtd/master' | Stephen Rothwell | |
Conflicts: drivers/mtd/maps/Makefile | |||
2009-03-25 | Merge commit 'wireless/master' | Stephen Rothwell | |
2009-03-25 | Merge commit 'net/master' | Stephen Rothwell | |
Conflicts: drivers/infiniband/hw/nes/nes_nic.c include/linux/netfilter/xt_limit.h include/linux/netfilter/xt_statistic.h | |||
2009-03-25 | Merge commit 'scsi/master' | Stephen Rothwell | |
2009-03-25 | Merge commit 'ubi/linux-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'acpi/test' | Stephen Rothwell | |
2009-03-25 | Merge commit 'infiniband/for-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'libata/NEXT' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/ide' | Stephen Rothwell | |
Conflicts: drivers/ide/ide-dma.c drivers/ide/ide-floppy.c include/linux/ide.h | |||
2009-03-25 | Merge commit 'v4l-dvb/master' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/i2c' | Stephen Rothwell | |
Conflicts: drivers/i2c/busses/i2c-mpc.c | |||
2009-03-25 | Merge commit 'hid/for-next' | Stephen Rothwell | |
2009-03-25 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2009-03-25 | Merge branch 'next-20090320/pci' | Stephen Rothwell | |
2009-03-25 | Merge commit 'timers/auto-timers-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'genirq/auto-genirq-next' | Stephen Rothwell | |
Conflicts: kernel/irq/handle.c | |||
2009-03-25 | Merge commit 'tracing/auto-tracing-next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'cpus4096/auto-cpus4096-next' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/intel_cacheinfo.c | |||
2009-03-25 | Merge commit 'tip-core/auto-core-next' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/pci-nommu.c lib/Kconfig.debug | |||
2009-03-25 | Merge commit 'x86/auto-x86-next' | Stephen Rothwell | |
Conflicts: arch/powerpc/include/asm/elf.h | |||
2009-03-25 | Merge commit 'sh/master' | Stephen Rothwell | |
2009-03-25 | Merge commit 's390/features' | Stephen Rothwell | |
2009-03-25 | Merge commit 'powerpc/next' | Stephen Rothwell | |
2009-03-25 | Merge commit 'm68knommu/for-next' | Stephen Rothwell | |