From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jun 2013 23:21:44 +0000 (-0700)
Subject: Merge tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b8e9dbacdd60c5a20ab2c77c08f047b2b990f303;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'ecryptfs-3.10-rc5-msync' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull ecryptfs fixes from Tyler Hicks:
 - Fixes how eCryptfs handles msync to sync both the upper and lower
   file
 - A couple of MAINTAINERS updates

* tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: Check return of filemap_write_and_wait during fsync
  Update eCryptFS maintainers
  ecryptfs: fixed msync to flush data
---

b8e9dbacdd60c5a20ab2c77c08f047b2b990f303