diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-25 19:01:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-25 19:01:12 -0700 |
| commit | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (patch) | |
| tree | 79c3c9d6e4258f38ff81dd141970885bbc65807a /drivers/watchdog/pc87413_wdt.c | |
| parent | 71e9e6a5823a6b7976c3e47e2f6c7ba364526a93 (diff) | |
| parent | 5be79de2e1ffa19d871a494697cf76cddee93384 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
eCryptfs: Flush dirty pages in setattr
eCryptfs: Handle failed metadata read in lookup
eCryptfs: Add reference counting to lower files
eCryptfs: dput dentries returned from dget_parent
eCryptfs: Remove extra d_delete in ecryptfs_rmdir
Diffstat (limited to 'drivers/watchdog/pc87413_wdt.c')
0 files changed, 0 insertions, 0 deletions