Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-10-27 | Add linux-next specific files for 20101027next-20101027 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2010-10-27 | Merge remote branch 'cleancache/linux-next' | Stephen Rothwell | |
Conflicts: include/linux/fs.h mm/Kconfig | |||
2010-10-27 | Merge remote branch 'staging-next/staging-next' | Stephen Rothwell | |
Conflicts: arch/arm/plat-omap/devices.c drivers/misc/Makefile drivers/misc/ti-st/st_core.c drivers/misc/ti-st/st_kim.c drivers/staging/Makefile drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audio-upstream.c drivers/staging/cx25821/cx25821-audio.h drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c drivers/staging/ti-st/st.h drivers/staging/ti-st/st_core.h fs/compat_ioctl.c | |||
2010-10-27 | Merge branch 'quilt/usb' | Stephen Rothwell | |
Conflicts: arch/powerpc/sysdev/fsl_soc.c drivers/scsi/sd.c drivers/usb/gadget/rndis.c drivers/usb/host/Kconfig drivers/usb/host/Makefile drivers/uwb/wlp/wss-lc.c | |||
2010-10-27 | Merge branch 'quilt/tty' | Stephen Rothwell | |
2010-10-27 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: drivers/misc/Makefile | |||
2010-10-27 | Merge remote branch 'sfi/sfi-test' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'edac-amd/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'xen-pvhvm/linux-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'swiotlb-xen/master' | Stephen Rothwell | |
Conflicts: arch/x86/include/asm/io_apic.h drivers/pci/Makefile | |||
2010-10-27 | Merge remote branch 'xen/upstream/xen' | Stephen Rothwell | |
Conflicts: arch/x86/xen/mmu.c | |||
2010-10-27 | Merge remote branch 'oprofile/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'tip/auto-latest' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'omap_dss2/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'spi/next-spi' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'i7300_edac/linux_next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: include/linux/Kbuild | |||
2010-10-27 | Merge remote branch 'catalin/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/kernel/Makefile arch/arm/mach-vexpress/ct-ca9x4.c arch/arm/mm/flush.c | |||
2010-10-27 | Merge remote branch 'suspend/linux-next' | Stephen Rothwell | |
2010-10-27 | Merge branch 'quilt/aoe' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'watchdog/master' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'agp/agp-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'viafb/viafb-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'drm/drm-next' | Stephen Rothwell | |
Conflicts: drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
2010-10-27 | Merge remote branch 'mfd/for-next' | Stephen Rothwell | |
Conflicts: drivers/mfd/sh_mobile_sdhi.c drivers/misc/Makefile | |||
2010-10-27 | Merge remote branch 'kgdb/kgdb-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'mmc/mmc-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'leds/for-mm' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'pcmcia/master' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'block/for-next' | Stephen Rothwell | |
Conflicts: fs/ocfs2/file.c | |||
2010-10-27 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'mtd/master' | Stephen Rothwell | |
Conflicts: drivers/mtd/mtd_blkdevs.c | |||
2010-10-27 | Merge remote branch 'bluetooth/master' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'async_tx/next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'scsi/master' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'ieee1394/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'idle-test/idle-test' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'acpi/test' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'infiniband/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'kconfig/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'kbuild/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'v4l-dvb/master' | Stephen Rothwell | |
2010-10-27 | Merge branch 'quilt/kernel-doc' | Stephen Rothwell | |
2010-10-27 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'bjdooks-i2c/next-i2c' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'pci/linux-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'v9fs/for-next' | Stephen Rothwell | |
2010-10-27 | Merge remote branch 'nfs/linux-next' | Stephen Rothwell | |