summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-09-16Add linux-next specific files for 20090916next-20090916Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-09-16Merge commit 'scsi-post-merge/master'Stephen Rothwell
Conflicts: drivers/scsi/Makefile
2009-09-16Merge branch 'quilt/staging'Stephen Rothwell
2009-09-16Merge branch 'quilt/usb'Stephen Rothwell
2009-09-16Merge branch 'quilt/tty'Stephen Rothwell
2009-09-16Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/base/class.c drivers/mtd/mtdcore.c init/main.c
2009-09-16Merge commit 'hwpoison/hwpoison'Stephen Rothwell
2009-09-16Merge commit 'asm-generic/next'Stephen Rothwell
2009-09-16Merge commit 'sfi/sfi-test'Stephen Rothwell
Conflicts: arch/x86/kernel/setup.c
2009-09-16Merge commit 'oprofile/for-next'Stephen Rothwell
2009-09-16Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/setup.c
2009-09-16Merge commit 'drbd/drbd'Stephen Rothwell
2009-09-16Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-09-16Merge commit 'irda/for-next'Stephen Rothwell
2009-09-16Merge commit 'fsnotify/for-next'Stephen Rothwell
2009-09-16Merge branch 'quilt/aoe'Stephen Rothwell
2009-09-16Merge commit 'omap/for-next'Stephen Rothwell
2009-09-16Merge commit 'trivial/for-next'Stephen Rothwell
2009-09-16Merge commit 'osd/linux-next'Stephen Rothwell
2009-09-16Merge commit 'cputime/cputime'Stephen Rothwell
2009-09-16Merge commit 'dwmw2-iommu/master'Stephen Rothwell
Conflicts: drivers/pci/intel-iommu.c
2009-09-16Merge commit 'watchdog/master'Stephen Rothwell
2009-09-16Merge commit 'uwb/for-upstream'Stephen Rothwell
2009-09-16Merge commit 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/Kconfig
2009-09-16Merge commit 'drm/drm-next'Stephen Rothwell
Conflicts: firmware/Makefile
2009-09-16Merge commit 'mfd/for-next'Stephen Rothwell
2009-09-16Merge commit 'slab/for-next'Stephen Rothwell
2009-09-16Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-09-16Merge commit 'backlight/for-mm'Stephen Rothwell
2009-09-16Merge commit 'leds/for-mm'Stephen Rothwell
2009-09-16Merge commit 'battery/master'Stephen Rothwell
Conflicts: drivers/power/wm97xx_battery.c
2009-09-16Merge commit 'block/for-next'Stephen Rothwell
2009-09-16Merge commit 'refs/next/20090908/rr'Stephen Rothwell
Conflicts: drivers/net/virtio_net.c
2009-09-16Merge commit 'cpufreq/next'Stephen Rothwell
2009-09-16Merge commit 'sound/for-next'Stephen Rothwell
2009-09-16Merge commit 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/mtdcore.c
2009-09-16Merge commit 'wireless/master'Stephen Rothwell
2009-09-16Merge commit 'async_tx/next'Stephen Rothwell
2009-09-16Merge commit 'dlm/next'Stephen Rothwell
2009-09-16Merge commit 'kvm/linux-next'Stephen Rothwell
2009-09-16Merge commit 'ubi/linux-next'Stephen Rothwell
2009-09-16Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-09-16Merge commit 'acpi/test'Stephen Rothwell
Conflicts: drivers/acpi/power.c drivers/pci/dmar.c
2009-09-16Merge commit 'infiniband/for-next'Stephen Rothwell
2009-09-16Merge commit 'kbuild/master'Stephen Rothwell
Conflicts: scripts/extract-ikconfig
2009-09-16Merge commit 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/video/sh_mobile_ceu_camera.c
2009-09-16Merge branch 'quilt/kernel-doc'Stephen Rothwell
2009-09-16Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-09-16Merge branch 'quilt/i2c'Stephen Rothwell
2009-09-16Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/powerpc/kernel/pci_64.c