Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-05-05 | Add linux-next specific files for 20100505next-20100505 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2010-05-05 | Merge remote branch 'staging-next/staging-next' | Stephen Rothwell | |
Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/netwave/netwave_cs.c | |||
2010-05-05 | Merge branch 'quilt/usb' | Stephen Rothwell | |
Conflicts: drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c sound/usb/usbaudio.c | |||
2010-05-05 | Merge branch 'quilt/tty' | Stephen Rothwell | |
Conflicts: include/linux/tty.h | |||
2010-05-05 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: drivers/base/platform.c drivers/staging/comedi/drivers/quatech_daqp_cs.c | |||
2010-05-05 | Merge remote branch 'bkl-ioctl/bkl/ioctl' | Stephen Rothwell | |
Conflicts: arch/cris/arch-v10/drivers/ds1302.c drivers/block/pktcdvd.c | |||
2010-05-05 | Merge remote branch 'bkl-procfs/bkl/procfs' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'bkl-core/bkl/core' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'workqueues/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'percpu/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'oprofile/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'tip/auto-latest' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt | |||
2010-05-05 | Merge remote branch 'omap_dss2/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'devicetree/next-devicetree' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: include/linux/Kbuild lib/Kconfig | |||
2010-05-05 | Merge remote branch 'drbd/for-jens' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'irda/for-next' | Stephen Rothwell | |
Conflicts: drivers/net/irda/irda-usb.c | |||
2010-05-05 | Merge remote branch 'fsnotify/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'suspend/linux-next' | Stephen Rothwell | |
2010-05-05 | Merge branch 'quilt/aoe' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'trivial/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'osd/linux-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'dwmw2-iommu/master' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'uwb/for-upstream' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'agp/agp-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'security-testing/next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'viafb/viafb-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'drm/drm-next' | Stephen Rothwell | |
Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/radeon/r300.c | |||
2010-05-05 | Merge remote branch 'mfd/for-next' | Stephen Rothwell | |
Conflicts: drivers/dma/Makefile drivers/dma/timb_dma.c | |||
2010-05-05 | Merge remote branch 'md/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'slab/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'kgdb/kgdb-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'backlight/for-mm' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'leds/for-mm' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'battery/master' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'pcmcia/master' | Stephen Rothwell | |
Conflicts: drivers/net/pcmcia/3c589_cs.c drivers/net/wireless/orinoco/orinoco_cs.c drivers/net/wireless/orinoco/spectrum_cs.c | |||
2010-05-05 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'block/for-next' | Stephen Rothwell | |
Conflicts: fs/ext3/fsync.c fs/ext4/fsync.c | |||
2010-05-05 | Merge remote branch 'input/next' | Stephen Rothwell | |
2010-05-05 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: drivers/net/virtio_net.c include/linux/mod_devicetable.h scripts/mod/file2alias.c | |||
2010-05-05 | Merge remote branch 'cpufreq/next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'crypto/master' | Stephen Rothwell | |
Conflicts: arch/arm/mach-omap2/devices.c | |||
2010-05-05 | Merge remote branch 'mtd/master' | Stephen Rothwell | |
Conflicts: drivers/mtd/mtdcore.c | |||
2010-05-05 | Merge remote branch 'wireless/master' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c | |||
2010-05-05 | Merge remote branch 'net/master' | Stephen Rothwell | |
Conflicts: drivers/scsi/iscsi_tcp.c | |||
2010-05-05 | Merge remote branch 'async_tx/next' | Stephen Rothwell | |
2010-05-05 | Merge remote branch 'scsi/master' | Stephen Rothwell | |