diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/usb/host/fhci-sched.c | |
parent | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | tree-wide: fix misspelling of "definition" in comments (diff) | |
download | linux-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.xz linux-d014d043869cdc591f3a33243d3481fa4479c2d0.zip |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/usb/host/fhci-sched.c')
-rw-r--r-- | drivers/usb/host/fhci-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c index 62a226b61670..00a29855d0c4 100644 --- a/drivers/usb/host/fhci-sched.c +++ b/drivers/usb/host/fhci-sched.c @@ -627,7 +627,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) /* - * Process normal completions(error or sucess) and clean the schedule. + * Process normal completions(error or success) and clean the schedule. * * This is the main path for handing urbs back to drivers. The only other patth * is process_del_list(),which unlinks URBs by scanning EDs,instead of scanning |