| commit | bccaeafd7c117acee36e90d37c7e05c19be9e7bf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 22 21:49:07 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 22 21:49:07 2011 -0700 |
| tree | d784e96c416ce5d2f47ecae6c0bb2a2aa8f5d1f3 | |
| parent | 68d0080f1e222757c85606d3eaf81b5c4aa7719f [diff] | |
| parent | ecc90462b428db2ad2ee5081c45496ed10f3a633 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: agstart field must be 64 bits JFS: Don't save agno in the inode jfs: Update agstart when resizing volume jfs: old_agsize should be 64 bits in jfs_extendfs