diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /include/linux/cper.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'include/linux/cper.h')
| -rw-r--r-- | include/linux/cper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cper.h b/include/linux/cper.h index 372a25839fd1..c23049496531 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h | |||
| @@ -310,7 +310,7 @@ struct cper_sec_proc_ia { | |||
| 310 | __u8 cpuid[48]; | 310 | __u8 cpuid[48]; |
| 311 | }; | 311 | }; |
| 312 | 312 | ||
| 313 | /* IA32/X64 Processor Error Infomation Structure */ | 313 | /* IA32/X64 Processor Error Information Structure */ |
| 314 | struct cper_ia_err_info { | 314 | struct cper_ia_err_info { |
| 315 | uuid_le err_type; | 315 | uuid_le err_type; |
| 316 | __u64 validation_bits; | 316 | __u64 validation_bits; |