diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/linux/cper.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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; |