aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/kernel/irq_lsapic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-16 21:15:18 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-16 21:15:18 -0700
commit5b58e21a27028a9f0399449d8bc8494fd9d9ff70 (patch)
treefba49cc745f791755a7e86d518376a740fd39f0a /arch/ia64/kernel/irq_lsapic.c
parent52ade9b3b97fd3bea42842a056fe0786c28d0555 (diff)
parent576fe0bd7e52dce7afb6b9b2450744555b2eb53a (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] optimize pagefaults a little [IA64] Fix section conflict of ia64_mlogbuf_finish [IA64] s/scalibility/scalability/ [IA64] kdump on INIT needs multi-nodes sync-up (v.2) [IA64] wire up {signal,timer,event}fd syscalls [IA64] spelling fixes: arch/ia64/
Diffstat (limited to 'arch/ia64/kernel/irq_lsapic.c')
-rw-r--r--arch/ia64/kernel/irq_lsapic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c
index c2f07beb175..e56a7a36aca 100644
--- a/arch/ia64/kernel/irq_lsapic.c
+++ b/arch/ia64/kernel/irq_lsapic.c
@@ -23,7 +23,7 @@ lsapic_noop_startup (unsigned int irq)
static void
lsapic_noop (unsigned int irq)
{
- /* nuthing to do... */
+ /* nothing to do... */
}
static int lsapic_retrigger(unsigned int irq)