summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2009-09-17Merge commit 'scsi-post-merge/master'Stephen Rothwell
Conflicts: drivers/scsi/Makefile drivers/scsi/pmcraid.c kernel/sysctl.c
2009-09-17Merge branch 'quilt/usb'Stephen Rothwell
2009-09-17Merge branch 'quilt/tty'Stephen Rothwell
2009-09-17Merge commit 'sfi/sfi-test'Stephen Rothwell
Conflicts: arch/x86/kernel/setup.c init/main.c
2009-09-17Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/setup.c
2009-09-17Merge commit 'drbd/drbd'Stephen Rothwell
2009-09-17Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-09-17Merge commit 'irda/for-next'Stephen Rothwell
2009-09-17Merge branch 'quilt/aoe'Stephen Rothwell
2009-09-17Merge commit 'omap/for-next'Stephen Rothwell
2009-09-17Merge commit 'trivial/for-next'Stephen Rothwell
2009-09-17Merge commit 'osd/linux-next'Stephen Rothwell
2009-09-17Merge commit 'dwmw2-iommu/master'Stephen Rothwell
Conflicts: drivers/pci/intel-iommu.c
2009-09-17Merge commit 'watchdog/master'Stephen Rothwell
2009-09-17Merge commit 'uwb/for-upstream'Stephen Rothwell
2009-09-17Merge commit 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/Kconfig
2009-09-17Merge commit 'drm/drm-next'Stephen Rothwell
Conflicts: firmware/Makefile
2009-09-17Merge commit 'mfd/for-next'Stephen Rothwell
2009-09-17Merge commit 'backlight/for-mm'Stephen Rothwell
2009-09-17Merge commit 'leds/for-mm'Stephen Rothwell
2009-09-17Merge commit 'battery/master'Stephen Rothwell
Conflicts: drivers/power/wm97xx_battery.c
2009-09-17Merge commit 'refs/next/20090908/rr'Stephen Rothwell
Conflicts: drivers/net/virtio_net.c
2009-09-17Merge commit 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/mtdcore.c
2009-09-17Merge commit 'wireless/master'Stephen Rothwell
2009-09-17Merge commit 'async_tx/next'Stephen Rothwell
2009-09-17Merge commit 'scsi/master'Stephen Rothwell
2009-09-17Merge commit 'ubi/linux-next'Stephen Rothwell
2009-09-17Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-09-17Merge commit 'acpi/test'Stephen Rothwell
Conflicts: drivers/acpi/power.c drivers/pci/dmar.c
2009-09-17Merge commit 'infiniband/for-next'Stephen Rothwell
2009-09-17Merge commit 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/video/sh_mobile_ceu_camera.c
2009-09-17Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-09-17Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/base/class.c
2009-09-17Merge commit 'sh/master'Stephen Rothwell
2009-09-17Merge commit 'microblaze/next'Stephen Rothwell
2009-09-17Merge commit 'm68knommu/for-next'Stephen Rothwell
2009-09-17Merge commit 'm68k/for-next'Stephen Rothwell
2009-09-17Merge commit 'ia64/test'Stephen Rothwell
Conflicts: arch/ia64/kernel/vmlinux.lds.S
2009-09-17Merge commit 'cris/for-next'Stephen Rothwell
2009-09-17Merge commit 'pxa/for-next'Stephen Rothwell
2009-09-17Merge commit 'arm/devel'Stephen Rothwell
2009-09-17Merge branch 'quilt/usb.current'Stephen Rothwell
2009-09-17Merge branch 'quilt/tty.current'Stephen Rothwell
Conflicts: drivers/serial/serial_cs.c
2009-09-17Merge commit 'net-current/master'Stephen Rothwell
2009-09-17Merge commit 'sparc-current/master'Stephen Rothwell
2009-09-17USB: skeleton: fix coding style issues.Greg Kroah-Hartman
This fixes up the majority of the coding style issues in the usb-skeleton driver. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-17USB: O_NONBLOCK in read path of skeletonOliver Neukum
Non blocking IO is supported in the read path of usb-skeleton. This is done by just not blocking. As support for handling signals without stopping IO is already there, it can be used for O_NONBLOCK, too. Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-17USB: make usb-skeleton honor O_NONBLOCK in write pathOliver Neukum
usb:usb-skeleton: honor O_NONBLOCK in write path nonblocking writes are allowed by using down_trylock if necessary to reserve an URB Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-17USB: skel_read really sucks royallyOliver Neukum
The read code path of the skeleton driver really sucks - skel_read works only for devices which always send data - the timeout comes out of thin air - it blocks signals for the duration of the timeout - it disallows nonblocking IO by design This patch fixes it by using a real urb, a completion and interruptible waits. Signed-off-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-17USB: Add hub descriptor update hook for xHCISarah Sharp
Add a hook for updating xHCI internal structures after khubd fetches the hub descriptor and sets up the hub's TT information. The xHCI driver must update the internal structures before devices under the hub can be enumerated. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>