Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-11-16 | Merge branch 'quilt/staging' | Stephen Rothwell | |
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/comedi/drivers/ni_labpc_cs.c drivers/staging/comedi/drivers/ni_mio_cs.c | |||
2009-11-16 | Merge branch 'quilt/usb' | Stephen Rothwell | |
2009-11-16 | Merge branch 'quilt/tty' | Stephen Rothwell | |
2009-11-16 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'sysctl/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'asm-generic/next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'workqueues/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'percpu/for-next' | Stephen Rothwell | |
Conflicts: arch/powerpc/platforms/pseries/hvCall.S arch/x86/kvm/svm.c kernel/softlockup.c | |||
2009-11-16 | Merge remote branch 'tip/auto-latest' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/kgdb.c kernel/irq/chip.c | |||
2009-11-16 | Merge remote branch 'omap_dss2/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/configs/omap_3430sdp_defconfig | |||
2009-11-16 | Merge remote branch 'limits/writable_limits' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'devicetree/next-devicetree' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: drivers/net/Kconfig include/linux/Kbuild lib/Kconfig | |||
2009-11-16 | Merge remote branch 'catalin/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'hwlat/for-linus' | Stephen Rothwell | |
Conflicts: drivers/misc/Makefile | |||
2009-11-16 | Merge remote branch 'irda/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'fsnotify/for-next' | Stephen Rothwell | |
Conflicts: arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S fs/afs/write.c fs/ubifs/file.c include/asm-generic/fcntl.h net/socket.c | |||
2009-11-16 | Merge remote branch 'suspend/linux-next' | Stephen Rothwell | |
2009-11-16 | Merge branch 'quilt/aoe' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'trivial/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'osd/linux-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'dwmw2-iommu/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'watchdog/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'agp/agp-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'security-testing/next' | Stephen Rothwell | |
Conflicts: Documentation/dontdiff | |||
2009-11-16 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile | |||
2009-11-16 | Merge remote branch 'drm/drm-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'mfd/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'md/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'slab/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'kgdb/kgdb-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'backlight/for-mm' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'leds/for-mm' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'pcmcia/master' | Stephen Rothwell | |
Conflicts: drivers/mtd/maps/pcmciamtd.c drivers/net/wireless/ray_cs.c drivers/pcmcia/Makefile | |||
2009-11-16 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'block/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'input/next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'tmio-mmc/linux-next' | Stephen Rothwell | |
2009-11-16 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'cpufreq/next' | Stephen Rothwell | |
Conflicts: include/acpi/processor.h | |||
2009-11-16 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'crypto/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'mtd/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'wireless/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'net/master' | Stephen Rothwell | |
Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig | |||
2009-11-16 | Merge remote branch 'scsi/master' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'kvm/linux-next' | Stephen Rothwell | |
Conflicts: arch/powerpc/kvm/timing.h | |||
2009-11-16 | Merge remote branch 'ubi/linux-next' | Stephen Rothwell | |
2009-11-16 | Merge remote branch 'ieee1394/for-next' | Stephen Rothwell | |