Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ab592d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 0910b444 eed66cfc

include/asm-ia64/sal.h

+2 −1
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { 
typedef struct sal_log_record_header {

	u64 id;				/* Unique monotonically increasing ID */

	sal_log_revision_t revision;	/* Major and Minor revision of header */

	u16 severity;			/* Error Severity */

	u8 severity;			/* Error Severity */

	u8 validation_bits;		/* 0: platform_guid, 1: !timestamp */

	u32 len;			/* Length of this error log in bytes */

	sal_log_timestamp_t timestamp;	/* Timestamp */

	efi_guid_t platform_guid;	/* Unique OEM Platform ID */