Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-02-24 | Merge branch 'quilt/usb' | Stephen Rothwell | |
Conflicts: drivers/usb/early/ehci-dbgp.c | |||
2010-02-24 | Merge branch 'quilt/tty' | Stephen Rothwell | |
2010-02-24 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: drivers/base/power/main.c drivers/pcmcia/ds.c include/linux/device.h | |||
2010-02-24 | Merge remote branch 'percpu/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'tip/auto-latest' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'als/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'omap_dss2/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'spi/next-spi' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'devicetree/next-devicetree' | Stephen Rothwell | |
Conflicts: arch/microblaze/include/asm/prom.h drivers/serial/pmac_zilog.c | |||
2010-02-24 | Merge remote branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: include/linux/Kbuild lib/Kconfig | |||
2010-02-24 | Merge remote branch 'drbd/for-jens' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'hwlat/for-linus' | Stephen Rothwell | |
Conflicts: MAINTAINERS drivers/misc/Makefile | |||
2010-02-24 | Merge remote branch 'irda/for-next' | Stephen Rothwell | |
Conflicts: drivers/net/irda/irda-usb.c | |||
2010-02-24 | Merge remote branch 'bluetooth/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'suspend/linux-next' | Stephen Rothwell | |
2010-02-24 | Merge branch 'quilt/aoe' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'trivial/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c | |||
2010-02-24 | Merge remote branch 'osd/linux-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'dwmw2-iommu/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'watchdog/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'uwb/for-upstream' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'mfd/for-next' | Stephen Rothwell | |
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile | |||
2010-02-24 | Merge remote branch 'kgdb/kgdb-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'backlight/for-mm' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'leds/for-mm' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'battery/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'pcmcia/master' | Stephen Rothwell | |
2010-02-24 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'block/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'input/next' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt | |||
2010-02-24 | Merge remote branch 'tmio-mmc/linux-next' | Stephen Rothwell | |
Conflicts: drivers/mfd/asic3.c drivers/mfd/t7l66xb.c drivers/mfd/tc6387xb.c drivers/mfd/tc6393xb.c drivers/mfd/tmio_core.c drivers/mmc/host/tmio_mmc.c drivers/mmc/host/tmio_mmc.h include/linux/mfd/tmio.h | |||
2010-02-24 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: drivers/char/hvc_console.c drivers/char/hvc_console.h | |||
2010-02-24 | Merge remote branch 'cpufreq/next' | Stephen Rothwell | |
Conflicts: drivers/acpi/processor_core.c | |||
2010-02-24 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/plat-mxc/Makefile | |||
2010-02-24 | Merge remote branch 'crypto/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'mtd/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'wireless/master' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/rt2x00/rt2800pci.c | |||
2010-02-24 | Merge remote branch 'net/master' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt | |||
2010-02-24 | Merge remote branch 'async_tx/next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'scsi/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'ubi/linux-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'ieee1394/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'acpi/test' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'infiniband/for-next' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'libata/NEXT' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'ide/master' | Stephen Rothwell | |
2010-02-24 | Merge remote branch 'v4l-dvb/master' | Stephen Rothwell | |
Conflicts: drivers/media/video/bt8xx/bttv-driver.c | |||
2010-02-24 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |