diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-21 00:32:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-21 00:32:20 -0500 |
| commit | 9d5004fcf6e4e8caa9efbc25c9f85059b165329c (patch) | |
| tree | 7f1b53d5487ffabb7be6e1f5b5b964448651b5bc /net/sched/act_simple.c | |
| parent | 453434cf3fdcd3954bb52460e37d4945a0913d3e (diff) | |
| parent | 361cf40519a491f68b28ad90225e4611c4bf8e12 (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: handle partial result from get_user_pages
ceph: mark user pages dirty on direct-io reads
ceph: fix null pointer dereference in ceph_init_dentry for nfs reexport
ceph: fix direct-io on non-page-aligned buffers
ceph: fix msgr_init error path
Diffstat (limited to 'net/sched/act_simple.c')
0 files changed, 0 insertions, 0 deletions