Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-03-09 | Add linux-next specific files for 20110309next-20110309 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2011-03-09 | Merge remote-tracking branch 'cleancache/linux-next' | Stephen Rothwell | |
Conflicts: fs/ocfs2/super.c fs/super.c include/linux/fs.h mm/Kconfig | |||
2011-03-09 | Merge remote-tracking branch 'bkl-config/config' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'staging/staging-next' | Stephen Rothwell | |
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c | |||
2011-03-09 | Merge remote-tracking branch 'usb/usb-next' | Stephen Rothwell | |
Conflicts: arch/arm/mach-omap2/board-omap3evm.c arch/arm/mach-omap2/board-overo.c arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/usb-musb.c arch/arm/plat-omap/include/plat/usb.h drivers/usb/gadget/Kconfig drivers/usb/gadget/fsl_mxc_udc.c drivers/usb/musb/musb_core.h | |||
2011-03-09 | Merge remote-tracking branch 'tty/tty-next' | Stephen Rothwell | |
Conflicts: drivers/tty/serial/Kconfig drivers/tty/serial/Makefile | |||
2011-03-09 | Merge remote-tracking branch 'driver-core/driver-core-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'drivers-x86/linux-next' | Stephen Rothwell | |
Conflicts: drivers/hwmon/lm85.c | |||
2011-03-09 | Merge remote-tracking branch 'workqueues/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'percpu/for-next' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/vmlinux.lds.S | |||
2011-03-09 | Merge remote-tracking branch 'edac-amd/for-next' | Stephen Rothwell | |
Conflicts: include/linux/pci_ids.h | |||
2011-03-09 | Merge remote-tracking branch 'xen-pvhvm/linux-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'xen-two/linux-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'oprofile/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'tip/auto-latest' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/acpi/sleep.c | |||
2011-03-09 | Merge remote-tracking branch 'spi/spi/next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'devicetree/devicetree/next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'i7300_edac/linux_next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'i7core_edac/linux_next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig | |||
2011-03-09 | Merge remote-tracking branch 'fsnotify/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'suspend/linux-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'trivial/for-next' | Stephen Rothwell | |
Conflicts: MAINTAINERS fs/eventpoll.c | |||
2011-03-09 | Merge remote-tracking branch 'osd/linux-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'dwmw2-iommu/master' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'watchdog/master' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'agp/agp-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'security-testing/next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'voltage/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'omap_dss2/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'drm/drm-next' | Stephen Rothwell | |
Conflicts: drivers/gpu/drm/nouveau/nouveau_mem.c | |||
2011-03-09 | Merge remote-tracking branch 'mfd/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c arch/arm/mach-mx3/mach-mx31_3ds.c arch/arm/mach-mx3/mach-mx31moboard.c drivers/mfd/davinci_voicecodec.c drivers/mfd/ucb1x00-ts.c drivers/mfd/wm8994-core.c | |||
2011-03-09 | Merge remote-tracking branch 'slab/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'kgdb/kgdb-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'mmc/mmc-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'leds/for-mm' | Stephen Rothwell | |
Conflicts: drivers/leds/Kconfig | |||
2011-03-09 | Merge remote-tracking branch 'battery/master' | Stephen Rothwell | |
2011-03-09 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'block/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'input/next' | Stephen Rothwell | |
2011-03-09 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'cpufreq/next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'sound/for-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'crypto/master' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'wireless/master' | Stephen Rothwell | |
2011-03-09 | Merge commit 'refs/next/20110308/net' | Stephen Rothwell | |
Conflicts: drivers/net/Kconfig drivers/net/bnx2x/bnx2x_cmn.c lib/Makefile | |||
2011-03-09 | Merge remote-tracking branch 'async_tx/next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'scsi/master' | Stephen Rothwell | |
Conflicts: drivers/scsi/libsas/sas_ata.c drivers/scsi/libsas/sas_scsi_host.c | |||
2011-03-09 | Merge remote-tracking branch 'kvm/linux-next' | Stephen Rothwell | |
2011-03-09 | Merge remote-tracking branch 'ubi/linux-next' | Stephen Rothwell | |