summaryrefslogtreecommitdiff
path: root/kernel/kmod.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-21 15:01:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-21 15:01:38 -0800
commit8bd89ca22010847e85de37b77d9f19f16b1962ad (patch)
tree0bcee2ae6a85443177a6d95ed960301e0f4c9d57 /kernel/kmod.c
parentb08b69a110bd981909c248f89997dcdcdfd5a39c (diff)
parent97d79b403ef03f729883246208ef5d8a2ebc4d68 (diff)
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: keep reference to parent inode on ceph_dentry ceph: queue cap_snaps once per realm libceph: fix socket write error handling libceph: fix socket read error handling
Diffstat (limited to 'kernel/kmod.c')
0 files changed, 0 insertions, 0 deletions