From 5ac51c9d289fc4354f792d264f286359f517e5c7 Mon Sep 17 00:00:00 2001
From: Javi Merino <javi.merino@arm.com>
Date: Wed, 26 Oct 2011 10:16:11 +0100
Subject: [PATCH] --- yaml --- r: 280447 b: refs/heads/master c:
 6d21af4f7d0ab660b24c8635f4ed577f40cd2978 h: refs/heads/master i:   280445:
 613aea9b2ee46121ed04b7ac160cd378448e789c   280443:
 33da25feffbee65709f0a61e2588a3fb52df10fe   280439:
 0910055286bcede72ade0207fe3da49923b5325b   280431:
 7a62f7ddbf7cf9d4bdbe1f0e3ef94d75f4c0b45a   280415:
 2fdf9d615fd2cbe7aa511a7a07457b31c746e8a2   280383:
 01d975bf97b8f95232a1df26cfe4da5eccbfa900   280319:
 3f3315a313bbda9f1266e0438c0e9730657774c9 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/manage.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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