summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-05-20Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c drivers/media/video/gspca/gspca.c sound/usb/usbaudio.c
2010-05-20Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: include/linux/tty.h
2010-05-20Revert "sysfs: add struct file* to bin_attr callbacks"Stephen Rothwell
This reverts commit f8e898186196a22756b50b908ecd92123265f8a2.
2010-05-20Revert "pci: check caps from sysfs file open to read device dependent config ↵Stephen Rothwell
space" This reverts commit 44e425ab9f887ec6d3a7a4481f3b0c99f120de19.
2010-05-20Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/base/platform.c
2010-05-20Merge remote branch 'bkl-ioctl/bkl/ioctl'Stephen Rothwell
2010-05-20Merge remote branch 'bkl-procfs/bkl/procfs'Stephen Rothwell
2010-05-20Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt kernel/Makefile
2010-05-20Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2010-05-20Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-05-20Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c drivers/serial/mpc52xx_uart.c
2010-05-20Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-05-20Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2010-05-20Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-05-20Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-05-20Merge branch 'quilt/aoe'Stephen Rothwell
2010-05-20Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-05-20Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2010-05-20Merge remote branch 'watchdog/master'Stephen Rothwell
2010-05-20Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-05-20Merge remote branch 'security-testing/next'Stephen Rothwell
2010-05-20Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-05-20Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-05-20Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-05-20Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/dma/Makefile drivers/dma/timb_dma.c
2010-05-20Merge remote branch 'md/for-next'Stephen Rothwell
Conflicts: drivers/md/md.c
2010-05-20Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-05-20Merge remote branch 'backlight/for-mm'Stephen Rothwell
2010-05-20Merge remote branch 'leds/for-mm'Stephen Rothwell
2010-05-20Merge remote branch 'battery/master'Stephen Rothwell
2010-05-20Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/mtd/maps/pcmciamtd.c drivers/net/pcmcia/3c589_cs.c drivers/net/wireless/orinoco/orinoco_cs.c drivers/net/wireless/orinoco/spectrum_cs.c
2010-05-20Merge branch 'quilt/device-mapper'Stephen Rothwell
2010-05-20Merge remote branch 'block/for-next'Stephen Rothwell
Conflicts: fs/ext3/fsync.c fs/ext4/fsync.c fs/fs-writeback.c
2010-05-20Merge remote branch 'input/next'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2010-05-20Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: drivers/net/virtio_net.c drivers/net/wireless/libertas_tf/if_usb.c
2010-05-20Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-05-20Merge remote branch 'sound/for-next'Stephen Rothwell
2010-05-20Merge remote branch 'crypto/master'Stephen Rothwell
2010-05-20Merge remote branch 'mtd/master'Stephen Rothwell
2010-05-20Merge remote branch 'net/master'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2010-05-20Merge remote branch 'async_tx/next'Stephen Rothwell
2010-05-20Merge remote branch 'scsi/master'Stephen Rothwell
2010-05-20Merge remote branch 'ibft/master'Stephen Rothwell
2010-05-20Merge remote branch 'ubi/linux-next'Stephen Rothwell
2010-05-20Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-05-20Merge remote branch 'acpi/test'Stephen Rothwell
2010-05-20Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-05-20Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-05-20Merge remote branch 'ide/master'Stephen Rothwell
2010-05-20Merge commit 'refs/next/20100519/v4l-dvb'Stephen Rothwell