Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Jun 2011 04:49:07 +0000 (21:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Jun 2011 04:49:07 +0000 (21:49 -0700)
commitbccaeafd7c117acee36e90d37c7e05c19be9e7bf
treed784e96c416ce5d2f47ecae6c0bb2a2aa8f5d1f3
parent68d0080f1e222757c85606d3eaf81b5c4aa7719f
parentecc90462b428db2ad2ee5081c45496ed10f3a633
Merge branch 'for-linus' of git://git./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