diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-05 18:43:22 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-05 18:43:22 (GMT) |
| commit | fb62c00a6d8942775abc23d1621db1252e2d93d1 (patch) | |
| tree | ef8760123f5a2b692126ecb7a70f2689053885c1 /drivers/watchdog/pika_wdt.c | |
| parent | 5c4b4be3b6b937256103a5ae49177e0c3a17cb8f (diff) | |
| parent | 455cec0abff563574cca432ced49f734117ca113 (diff) | |
| download | linux-fsl-qoriq-fb62c00a6d8942775abc23d1621db1252e2d93d1.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: no .snap inside of snapped namespace
libceph: fix msgr standby handling
libceph: fix msgr keepalive flag
libceph: fix msgr backoff
libceph: retry after authorization failure
libceph: fix handling of short returns from get_user_pages
ceph: do not clear I_COMPLETE from d_release
ceph: do not set I_COMPLETE
Revert "ceph: keep reference to parent inode on ceph_dentry"
Diffstat (limited to 'drivers/watchdog/pika_wdt.c')
0 files changed, 0 insertions, 0 deletions