Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual earth-shaking, news-breaking, rocket science pile from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: usb: Fix typo in Documentation/usb/gadget_configs.txt doc: add missing files to timers/00-INDEX timekeeping: Fix some trivial typos in comments mm: Fix some trivial typos in comments irq: Fix some trivial typos in comments NUMA: fix typos in Kconfig help text mm: update 00-INDEX doc: Documentation/DMA-attributes.txt fix typo DRM: comment: `halve' -> `half' Docs: Kconfig: `devlopers' -> `developers' doc: typo on word accounting in kprobes.c in mutliple architectures treewide: fix "usefull" typo treewide: fix "distingush" typo mm/Kconfig: Grammar s/an/a/ kexec: Typo s/the/then/ Documentation/kvm: Update cpuid documentation for steal time and pv eoi treewide: Fix common typo in "identify" __page_to_pfn: Fix typo in comment Correct some typos for word frequency clk: fixed-factor: Fix a trivial typo ...
This commit is contained in:
@ -214,7 +214,7 @@ void irq_enable(struct irq_desc *desc)
|
||||
}
|
||||
|
||||
/**
|
||||
* irq_disable - Mark interupt disabled
|
||||
* irq_disable - Mark interrupt disabled
|
||||
* @desc: irq descriptor which should be disabled
|
||||
*
|
||||
* If the chip does not implement the irq_disable callback, we
|
||||
|
@ -786,7 +786,7 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
|
||||
}
|
||||
|
||||
/*
|
||||
* Interrupts explicitely requested as threaded interupts want to be
|
||||
* Interrupts explicitly requested as threaded interrupts want to be
|
||||
* preemtible - many of them need to sleep and wait for slow busses to
|
||||
* complete.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user