git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[safe/jmp/linux-2.6]
/
include
/
asm-arm
/
thread_info.h
diff --git
a/include/asm-arm/thread_info.h
b/include/asm-arm/thread_info.h
index
c52e0bf
..
f28b236
100644
(file)
--- a/
include/asm-arm/thread_info.h
+++ b/
include/asm-arm/thread_info.h
@@
-117,7
+117,7
@@
extern void iwmmxt_task_switch(struct thread_info *);
/*
* We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occuring. See include/asm-arm/hardirq.h.
+ * preemption is occur
r
ing. See include/asm-arm/hardirq.h.
*/
#define PREEMPT_ACTIVE 0x40000000