diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 19:18:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 19:18:44 +0200 |
commit | ade61088bc77dd209f8edadbe544f1e5dad6c287 (patch) | |
tree | 50a2eb0b78a470f379801a5abc73ff822f1e47c0 /drivers/watchdog/pika_wdt.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
parent | NFS: Fix another nfs_wb_page() deadlock (diff) | |
download | linux-ade61088bc77dd209f8edadbe544f1e5dad6c287.tar.xz linux-ade61088bc77dd209f8edadbe544f1e5dad6c287.zip |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: Fix another nfs_wb_page() deadlock
NFS: Ensure that we mark the inode as dirty if we exit early from commit
NFS: Fix a lock imbalance typo in nfs_access_cache_shrinker
sunrpc: fix leak on error on socket xprt setup
Diffstat (limited to 'drivers/watchdog/pika_wdt.c')
0 files changed, 0 insertions, 0 deletions