diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:15:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-16 21:15:18 -0700 |
| commit | 5b58e21a27028a9f0399449d8bc8494fd9d9ff70 (patch) | |
| tree | fba49cc745f791755a7e86d518376a740fd39f0a /arch/ia64/kernel/salinfo.c | |
| parent | 52ade9b3b97fd3bea42842a056fe0786c28d0555 (diff) | |
| parent | 576fe0bd7e52dce7afb6b9b2450744555b2eb53a (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/salinfo.c')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index 89f6b138a62..25cd75f50ab 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c @@ -162,7 +162,7 @@ static DEFINE_SPINLOCK(data_saved_lock); /** salinfo_platform_oemdata - optional callback to decode oemdata from an error * record. * @sect_header: pointer to the start of the section to decode. - * @oemdata: returns vmalloc area containing the decded output. + * @oemdata: returns vmalloc area containing the decoded output. * @oemdata_size: returns length of decoded output (strlen). * * Description: If user space asks for oem data to be decoded by the kernel |