From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Sep 2009 16:18:52 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2511817cf9b1cf2506f47e20bb128e2da231c150;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  ext3: Flush disk caches on fsync when needed
  ext3: Add locking to ext3_do_update_inode
  ext3: Fix possible deadlock between ext3_truncate() and ext3_get_blocks()
  jbd: Annotate transaction start also for journal_restart()
  jbd: Journal block numbers can ever be only 32-bit use unsigned int for them
  ext3: Update MAINTAINERS for ext3 and JBD
  JBD: round commit timer up to avoid uncommitted transaction
---

2511817cf9b1cf2506f47e20bb128e2da231c150