diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-17 10:57:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-17 10:57:56 -0700 |
| commit | 65832940eb74dca5ef1c8df086540825a00ad0c8 (patch) | |
| tree | bbb489e09122106e6d6eb5b76b936a8a0a04be53 /fs/ecryptfs/inode.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | xfs: don't warn on EAGAIN in inode reclaim (diff) | |
| download | linux-dev-65832940eb74dca5ef1c8df086540825a00ad0c8.tar.xz linux-dev-65832940eb74dca5ef1c8df086540825a00ad0c8.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: don't warn on EAGAIN in inode reclaim
xfs: ensure that sync updates the log tail correctly
Diffstat (limited to 'fs/ecryptfs/inode.c')
0 files changed, 0 insertions, 0 deletions