git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio
[pandora-kernel.git]
/
fs
/
ocfs2
/
ocfs1_fs_compat.h
diff --git
a/fs/ocfs2/ocfs1_fs_compat.h
b/fs/ocfs2/ocfs1_fs_compat.h
index
0b499bc
..
dfb313b
100644
(file)
--- a/
fs/ocfs2/ocfs1_fs_compat.h
+++ b/
fs/ocfs2/ocfs1_fs_compat.h
@@
-77,7
+77,7
@@
struct ocfs1_disk_lock
{
/*00*/ __u32 curr_master;
__u8 file_lock;
- __u8 compat_pad[3]; /* Not in orignal definition. Used to
+ __u8 compat_pad[3]; /* Not in orig
i
nal definition. Used to
make the already existing alignment
explicit */
__u64 last_write_time;