summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-07-23Merge branch 'quilt/device-mapper'Stephen Rothwell
Conflicts: drivers/md/dm.c
2010-07-23Merge remote branch 'block/for-next'Stephen Rothwell
Conflicts: drivers/block/virtio_blk.c drivers/scsi/scsi_error.c
2010-07-23Merge remote branch 'input/next'Stephen Rothwell
Conflicts: arch/arm/plat-samsung/include/plat/keypad.h
2010-07-23Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/um/drivers/hostaudio_kern.c
2010-07-23Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-07-23Merge remote branch 'sound/for-next'Stephen Rothwell
Conflicts: Documentation/kernel-parameters.txt
2010-07-23Merge remote branch 'crypto/master'Stephen Rothwell
2010-07-23Merge remote branch 'mtd/master'Stephen Rothwell
2010-07-23Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-commands.h
2010-07-23Merge remote branch 'net/master'Stephen Rothwell
2010-07-23Merge remote branch 'async_tx/next'Stephen Rothwell
2010-07-23Merge remote branch 'scsi/master'Stephen Rothwell
2010-07-23Merge remote branch 'ibft/master'Stephen Rothwell
2010-07-23Merge remote branch 'ubi/linux-next'Stephen Rothwell
2010-07-23Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'acpi/test'Stephen Rothwell
2010-07-23Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-07-23Merge remote branch 'ide/master'Stephen Rothwell
2010-07-23Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-07-23Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-07-23Merge branch 'quilt/i2c'Stephen Rothwell
2010-07-23Merge remote branch 'hid/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-07-23Merge remote branch 'vfs/for-next'Stephen Rothwell
Conflicts: fs/nilfs2/super.c fs/xfs/linux-2.6/xfs_super.c
2010-07-23Merge remote branch 'tile/master'Stephen Rothwell
2010-07-23Merge remote branch 'genesis/master'Stephen Rothwell
Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig
2010-07-23Merge remote branch 'sh/master'Stephen Rothwell
2010-07-23Merge remote branch 's390/features'Stephen Rothwell
2010-07-23Merge remote branch '52xx-and-virtex/next'Stephen Rothwell
Conflicts: drivers/serial/mpc52xx_uart.c
2010-07-23Merge remote branch 'powerpc/next'Stephen Rothwell
2010-07-23Merge remote branch 'mips/mips-for-linux-next'Stephen Rothwell
2010-07-23Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'm68k/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'omap/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/board-3430sdp.c arch/arm/mach-omap2/board-3630sdp.c arch/arm/mach-omap2/board-am3517evm.c arch/arm/mach-omap2/board-cm-t35.c arch/arm/mach-omap2/board-devkit8000.c arch/arm/mach-omap2/board-igep0020.c arch/arm/mach-omap2/board-ldp.c arch/arm/mach-omap2/board-omap3beagle.c arch/arm/mach-omap2/board-omap3evm.c arch/arm/mach-omap2/board-omap3pandora.c arch/arm/mach-omap2/board-omap3touchbook.c arch/arm/mach-omap2/board-overo.c arch/arm/mach-omap2/board-zoom2.c arch/arm/mach-omap2/board-zoom3.c
2010-07-23Merge remote branch 'msm/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'i.MX/for-next'Stephen Rothwell
2010-07-23Merge remote branch 'arm/devel'Stephen Rothwell
2010-07-23Merge remote branch 'ide-curent/master'Stephen Rothwell
2010-07-23Merge branch 'quilt/usb.current'Stephen Rothwell
2010-07-23Merge branch 'quilt/tty.current'Stephen Rothwell
2010-07-23Merge remote branch 'net-current/master'Stephen Rothwell
2010-07-23Merge remote branch 'scsi-rc-fixes/master'Stephen Rothwell
2010-07-23Merge remote branch 'arm-current/master'Stephen Rothwell
2010-07-23USB: musb: tusb6010: fix compile error with n8x0_defconfigFelipe Balbi
Drop the unnecessary empty stubs in tusb6010.c and avoid a compile error when building kernel for n8x0. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-23USB: FTDI: Add support for the RT System VX-7 radio programming cableCorey Minyard
RT Systems has put out bunch of ham radio cables based on the FT232RL chip. Each cable type has a unique PID, this adds one for the Yaesu VX-7 radios. Signed-off-by: Corey Minyard <minyard@acm.org> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-23USB: add quirk for Broadcom BT dongleOliver Neukum
This device needs to be reset when resuming Signed-off-by: Oliver Neukum <oneukum@suse.de> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-23USB: usb-storage: fix initializations of urb fieldsBob Copeland
Commit 0ede76fcec5415ef82a423a95120286895822e2d, "USB: remove uses of URB_NO_SETUP_DMA_MAP" introduced a regression by inadvertantly removing initialization of the transfer flags. This caused initialization failures in the ums-karma driver. Fix the regression by zeroing it. While at it, as Alan Stern points out, the initializers for actual_length and status are handled by the core and error_count only matters for isochronous urbs, so they don't need to be set here. Remove them. Signed-off-by: Bob Copeland <me@bobcopeland.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-23USB: xhci: Set Mult field in endpoint context correctly.Sarah Sharp
The bmAttributes field of the SuperSpeed Endpoint Companion Descriptor has different meanings, depending on the endpoint type. If the endpoint is isochronous, the bmAttributes field is the maximum number of packets within a service interval that this endpoint supports. If the endpoint is bulk, it's the number of stream IDs this endpoint supports. Only set the Mult field of the xHCI endpoint context using the bmAttributes field if the endpoint is isochronous, and the device is a SuperSpeed device. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-07-23USB: sisusbvga: Fix for USB 3.0Oliver Neukum
Super speed is also fast enough to let sisusbvga operate. Therefor expand the checks. Signed-off-by: Oliver Neukum <oneukum@suse.de> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>