aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/falconide.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-04 17:22:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-04 17:22:53 -0400
commit0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a (patch)
tree2b599cd66f1747d4e246d906b0e240ffd7ed0263 /drivers/ide/falconide.c
parentbd355f8ae6577aa6b444ab76bb1dfeb1a7002d9f (diff)
parent4f0871a6c7811a433513c3788a7cce27033bb8b8 (diff)
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: xHCI: Clear PLC in xhci_bus_resume() USB: fix regression in usbip by setting has_tt flag usb/isp1760: Report correct urb status after unlink omap:usb: add regulator support for EHCI mfd: Fix usbhs_enable error handling usb: musb: gadget: Fix out-of-sync runtime pm calls usb: musb: omap2430: Fix retention idle on musb peripheral only boards
Diffstat (limited to 'drivers/ide/falconide.c')
0 files changed, 0 insertions, 0 deletions