From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Jun 2011 04:49:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bccaeafd7c117acee36e90d37c7e05c19be9e7bf;p=~shefty%2Frdma-dev.git

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
---

bccaeafd7c117acee36e90d37c7e05c19be9e7bf