summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-29 17:50:15 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-29 17:50:15 +0200
commitb939e414f0dbd7ac8d38da2c7e3a419728229afd (patch)
tree7d54bd66e249fa7432e1eac7ef303049621f7590 /drivers/ide/ide-io.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (diff)
parentRevert "USB: Correct Makefile to make isp1760 buildable" (diff)
downloadlinux-b939e414f0dbd7ac8d38da2c7e3a419728229afd.tar.xz
linux-b939e414f0dbd7ac8d38da2c7e3a419728229afd.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: Revert "USB: Correct Makefile to make isp1760 buildable" usb-serial: fix crash when sub-driver updates firmware USB: isp1760: urb_dequeue doesn't always find the urbs USB: Yet another Conexant Clone to add to cdc-acm.c USB: atmel_usb_udc: Use kzalloc() to allocate ep structures USB: atmel-usba-udc : fix control out requests.
Diffstat (limited to 'drivers/ide/ide-io.c')
0 files changed, 0 insertions, 0 deletions