Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-05-18 | Merge branch 'quilt/staging' | Stephen Rothwell | |
Conflicts: drivers/staging/rt2860/common/mlme.c drivers/staging/rt2870/common/mlme.c drivers/staging/rt3070/common/mlme.c | |||
2009-05-18 | Merge branch 'quilt/usb' | Stephen Rothwell | |
Conflicts: drivers/usb/serial/sierra.c | |||
2009-05-18 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: init/main.c | |||
2009-05-18 | Merge commit 'suspend/linux-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'kmemleak/kmemleak' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S lib/Kconfig.debug mm/slob.c | |||
2009-05-18 | Merge commit 'trivial/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'osd/linux-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'dwmw2-iommu/master' | Stephen Rothwell | |
Conflicts: drivers/pci/intel-iommu.c drivers/pci/intr_remapping.c | |||
2009-05-18 | Merge commit 'watchdog/master' | Stephen Rothwell | |
2009-05-18 | Merge commit 'oprofile/auto-oprofile-next' | Stephen Rothwell | |
2009-05-18 | Merge branch 'quilt/ttydev' | Stephen Rothwell | |
2009-05-18 | Merge commit 'security-testing/next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'voltage/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'mfd/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'md/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'firmware/master' | Stephen Rothwell | |
2009-05-18 | scsi/block: fixup scsi_transport_fc for block changes | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2009-05-18 | Merge commit 'block/for-next' | Stephen Rothwell | |
Conflicts: drivers/block/hd.c drivers/block/mg_disk.c drivers/block/virtio_blk.c drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c | |||
2009-05-18 | Merge commit 'input/next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'mmc/next' | Stephen Rothwell | |
2009-05-18 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2009-05-18 | Merge commit 'crypto/master' | Stephen Rothwell | |
2009-05-18 | Revert "rfkill: remove user_claim stuff" | Stephen Rothwell | |
This reverts commit 621cac85297de5ba655e3430b007dd2e0da91da6. | |||
2009-05-18 | Merge commit 'wireless/master' | Stephen Rothwell | |
2009-05-18 | Merge commit 'net/master' | Stephen Rothwell | |
Conflicts: include/linux/mmc/sdio_ids.h | |||
2009-05-18 | Merge commit 'scsi/master' | Stephen Rothwell | |
Conflicts: include/Kbuild | |||
2009-05-18 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'acpi/test' | Stephen Rothwell | |
2009-05-18 | Merge commit 'infiniband/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'libata/NEXT' | Stephen Rothwell | |
2009-05-18 | Merge commit 'ide/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'v4l-dvb/master' | Stephen Rothwell | |
2009-05-18 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2009-05-18 | Merge branch 'quilt/i2c' | Stephen Rothwell | |
2009-05-18 | Merge commit 'hid/for-next' | Stephen Rothwell | |
2009-05-18 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2009-05-18 | Merge commit 'pci/linux-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'genirq/auto-genirq-next' | Stephen Rothwell | |
Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c | |||
2009-05-18 | Merge commit 'tracing/auto-tracing-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'x86/auto-x86-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'sh/master' | Stephen Rothwell | |
2009-05-18 | Merge commit 's390/features' | Stephen Rothwell | |
2009-05-18 | Merge commit 'pxa/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/mach-pxa/viper.c | |||
2009-05-18 | Merge commit 'galak/next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'mips/mips-for-linux-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'm68k/for-next' | Stephen Rothwell | |
2009-05-18 | Merge commit 'avr32/avr32-arch' | Stephen Rothwell | |
2009-05-18 | Merge commit 'arm/devel' | Stephen Rothwell | |
2009-05-18 | Merge branch 'quilt/usb.current' | Stephen Rothwell | |
2009-05-18 | Merge commit 'scsi-rc-fixes/master' | Stephen Rothwell | |