summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2011-03-01Merge remote-tracking branch 'cleancache/linux-next'Stephen Rothwell
Conflicts: fs/ocfs2/super.c fs/super.c include/linux/fs.h mm/Kconfig
2011-03-01Merge remote-tracking branch 'bkl-config/config'Stephen Rothwell
Conflicts: arch/powerpc/kernel/setup_64.c drivers/scsi/pm8001/pm8001_sas.h drivers/staging/Kconfig drivers/staging/stradis/Kconfig fs/nfsd/nfs4state.c include/linux/hardirq.h include/linux/smp_lock.h
2011-03-01Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
Conflicts: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
2011-03-01Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
Conflicts: drivers/usb/gadget/Kconfig
2011-03-01Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
Conflicts: drivers/tty/serial/Kconfig drivers/tty/serial/Makefile
2011-03-01Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'drivers-x86/linux-next'Stephen Rothwell
Conflicts: drivers/hwmon/lm85.c
2011-03-01Merge remote-tracking branch 'workqueues/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/vmlinux.lds.S
2011-03-01Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
Conflicts: include/linux/pci_ids.h
2011-03-01Merge remote-tracking branch 'xen-pvhvm/linux-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'xen-two/linux-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'oprofile/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/acpi/sleep.c
2011-03-01Merge remote-tracking branch 'spi/spi/next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'devicetree/devicetree/next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig
2011-03-01Merge remote-tracking branch 'fsnotify/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'suspend/linux-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
Conflicts: MAINTAINERS fs/eventpoll.c
2011-03-01Merge remote-tracking branch 'watchdog/master'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'selinux/master'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'security-testing/next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'drm/drm-next'Stephen Rothwell
2011-03-01Merge 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
2011-03-01Merge remote-tracking branch 'slab/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'mmc/mmc-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'battery/master'Stephen Rothwell
2011-03-01Merge branch 'quilt/device-mapper'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'block/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'input/next'Stephen Rothwell
2011-03-01Merge branch 'quilt/rr'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'sound/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'bluetooth/master'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'wireless/master'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'net/master'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'async_tx/next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'scsi/master'Stephen Rothwell
Conflicts: drivers/scsi/libsas/sas_ata.c drivers/scsi/libsas/sas_scsi_host.c
2011-03-01Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'ieee1394/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'acpi/test'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'libata/NEXT'Stephen Rothwell
2011-03-01Merge commit 'refs/next/20110225/v4l-dvb'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'hwmon-staging/hwmon-next'Stephen Rothwell
Conflicts: drivers/hwmon/Makefile
2011-03-01Merge remote-tracking branch 'bjdooks-i2c/next-i2c'Stephen Rothwell
2011-03-01Merge branch 'quilt/i2c'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'hid/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'pci/linux-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'v9fs/for-next'Stephen Rothwell
2011-03-01Merge remote-tracking branch 'nilfs2/for-next'Stephen Rothwell