summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2010-05-03Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c sound/usb/usbaudio.c
2010-05-03Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: include/linux/tty.h
2010-05-03Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/base/platform.c drivers/staging/comedi/drivers/quatech_daqp_cs.c
2010-05-03Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2010-05-03Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2010-05-03Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-05-03Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2010-05-03Merge remote branch 'fsnotify/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-05-03Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2010-05-03Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-05-03Merge remote branch 'security-testing/next'Stephen Rothwell
2010-05-03Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/radeon/r300.c
2010-05-03Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/dma/Makefile drivers/dma/timb_dma.c
2010-05-03Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-05-03Merge remote branch 'battery/master'Stephen Rothwell
2010-05-03Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/3c589_cs.c
2010-05-03Merge remote branch 'block/for-next'Stephen Rothwell
Conflicts: fs/ext3/fsync.c fs/ext4/fsync.c
2010-05-03Merge remote branch 'input/next'Stephen Rothwell
2010-05-03Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/net/virtio_net.c include/linux/mod_devicetable.h scripts/mod/file2alias.c
2010-05-03Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-05-03Merge remote branch 'sound/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/mtdcore.c
2010-05-03Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c
2010-05-03Merge commit 'refs/next/20100430/net'Stephen Rothwell
Conflicts: drivers/scsi/iscsi_tcp.c
2010-05-03Merge remote branch 'async_tx/next'Stephen Rothwell
2010-05-03Merge remote branch 'scsi/master'Stephen Rothwell
2010-05-03Merge remote branch 'ibft/master'Stephen Rothwell
2010-05-03Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-05-03Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'acpi/test'Stephen Rothwell
2010-05-03Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-05-03Merge remote branch 'kbuild/for-next'Stephen Rothwell
2010-05-03Merge commit 'refs/next/20100409/v4l-dvb'Stephen Rothwell
Conflicts: drivers/media/video/meye.c drivers/media/video/soc_camera.c drivers/staging/cx25821/cx25821-audio-upstream.c
2010-05-03Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-05-03Merge branch 'quilt/i2c'Stephen Rothwell
2010-05-03Merge remote branch 'hid/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-05-03Merge remote branch 'v9fs/for-next'Stephen Rothwell
Conflicts: fs/9p/vfs_super.c
2010-05-03Merge remote branch 'nilfs2/for-next'Stephen Rothwell
2010-05-03Merge remote branch 'nfsd/nfsd-next'Stephen Rothwell
2010-05-03Merge remote branch 'nfs/linux-next'Stephen Rothwell
2010-05-03Merge remote branch 'ext3/for_next'Stephen Rothwell
2010-05-03Merge remote branch 'genesis/master'Stephen Rothwell
2010-05-03Merge remote branch 'sh/master'Stephen Rothwell
2010-05-03Merge remote branch 'powerpc/next'Stephen Rothwell
2010-05-03Merge remote branch 'msm/for-next'Stephen Rothwell