summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2009-09-04Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/at76_usb/at76_usb.c drivers/staging/epl/VirtualEthernetLinux.c
2009-09-04Merge branch 'quilt/usb'Stephen Rothwell
2009-09-04Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h
2009-09-04Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/base/class.c init/main.c
2009-09-04Merge commit 'sfi/sfi-test'Stephen Rothwell
Conflicts: arch/x86/kernel/setup.c
2009-09-04Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S kernel/sched.c
2009-09-04Merge commit 'edac-amd/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/smpboot.c include/linux/topology.h
2009-09-04Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/include/asm/socket.h arch/x86/kernel/setup.c drivers/pci/dmar.c drivers/pci/intel-iommu.c include/linux/rcupdate.h kernel/fork.c
2009-09-04Merge commit 'drbd/drbd'Stephen Rothwell
2009-09-04Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-09-04Merge commit 'irda/for-next'Stephen Rothwell
2009-09-04Merge commit 'suspend/linux-next'Stephen Rothwell
2009-09-04Merge branch 'quilt/aoe'Stephen Rothwell
2009-09-04Merge commit 'omap/for-next'Stephen Rothwell
2009-09-04Merge commit 'trivial/for-next'Stephen Rothwell
2009-09-04Merge commit 'osd/linux-next'Stephen Rothwell
2009-09-04Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-09-04Merge commit 'watchdog/master'Stephen Rothwell
2009-09-04Merge commit 'uwb/for-upstream'Stephen Rothwell
2009-09-04Merge commit 'agp/agp-next'Stephen Rothwell
Conflicts: drivers/char/agp/uninorth-agp.c
2009-09-04Merge commit 'refs/next/20090902/security-testing'Stephen Rothwell
2009-09-04Merge commit 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/Kconfig
2009-09-04Merge commit 'drm/drm-next'Stephen Rothwell
Conflicts: firmware/Makefile
2009-09-04Merge commit 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/input/misc/Kconfig
2009-09-04Merge commit 'battery/master'Stephen Rothwell
2009-09-04Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-09-04Merge commit 'block/for-next'Stephen Rothwell
Conflicts: fs/ubifs/super.c
2009-09-04Merge commit 'input/next'Stephen Rothwell
Conflicts: drivers/base/platform.c
2009-09-04Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/net/virtio_net.c
2009-09-04Merge commit 'cpufreq/next'Stephen Rothwell
2009-09-04Merge commit 'crypto/master'Stephen Rothwell
2009-09-04Merge commit 'mtd/master'Stephen Rothwell
2009-09-04Merge commit 'net/master'Stephen Rothwell
2009-09-04Merge commit 'scsi/master'Stephen Rothwell
2009-09-04Merge commit 'ubi/linux-next'Stephen Rothwell
2009-09-04Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-09-04Merge commit 'refs/next/20090831/acpi'Stephen Rothwell
2009-09-04Merge commit 'infiniband/for-next'Stephen Rothwell
2009-09-04Merge commit 'libata/NEXT'Stephen Rothwell
2009-09-04Merge commit 'ide/master'Stephen Rothwell
2009-09-04Merge commit 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/video/gspca/Kconfig drivers/media/video/sh_mobile_ceu_camera.c
2009-09-04Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-09-04Merge branch 'quilt/i2c'Stephen Rothwell
2009-09-04Merge commit 'hid/for-next'Stephen Rothwell
2009-09-04Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/powerpc/kernel/pci_64.c
2009-09-04Merge commit 'ext3/for_next'Stephen Rothwell
2009-09-04Merge commit 'sh/master'Stephen Rothwell
2009-09-04Merge commit 's390/features'Stephen Rothwell
2009-09-04Merge commit 'powerpc/next'Stephen Rothwell
Conflicts: kernel/gcov/Kconfig
2009-09-04Merge commit 'microblaze/next'Stephen Rothwell