projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68d0080 ecc9046)
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)
* '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


Trivial merge
John Crispins staging tree