diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 08:48:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 08:48:58 -0700 |
commit | 162164f7e92da970666e7492fd58644f3c1f8574 (patch) | |
tree | c69448e73d24bf83cd412c04d525eb541a84cdc0 /fs/minix/inode.c | |
parent | d8d048f69a618c531575cb1f398a7186f0532ef2 (diff) | |
parent | 5f3b321da1aa5936c85ed6dec67358239a9d3cfd (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: fix function prototype
Squashfs: fix use of __le64 annotated variable
Diffstat (limited to 'fs/minix/inode.c')
0 files changed, 0 insertions, 0 deletions