diff --git a/[refs] b/[refs] index 7b901b12546e..acda3bd9c9fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff5f483f30918759e78371a8deb498c46fdae051 +refs/heads/master: 6d21af4f7d0ab660b24c8635f4ed577f40cd2978 diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index 9b956fa20308..3261c4d478a2 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/kernel/irq/manage.c @@ -1281,7 +1281,7 @@ EXPORT_SYMBOL(free_irq); * and to set up the interrupt handler in the right order. * * If you want to set up a threaded irq handler for your device - * then you need to supply @handler and @thread_fn. @handler ist + * then you need to supply @handler and @thread_fn. @handler is * still called in hard interrupt context and has to check * whether the interrupt originates from the device. If yes it * needs to disable the interrupt on the device and return