diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:42:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 19:42:18 -0400 |
| commit | 97d2eb13a019ec09cc1a7ea2d3705c0b117b3c0d (patch) | |
| tree | 86f6382941f8cfc41647d33d87bec7bc1407c18c /drivers/ata/libata-scsi.c | |
| parent | 68d99b2c8efcb6ed3807a55569300c53b5f88be5 (diff) | |
| parent | 339573406737461cfb17bebabf7ba536a302d841 (diff) | |
Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client
* 'for-linus' of git://ceph.newdream.net/git/ceph-client:
libceph: fix double-free of page vector
ceph: fix 32-bit ino numbers
libceph: force resend of osd requests if we skip an osdmap
ceph: use kernel DNS resolver
ceph: fix ceph_monc_init memory leak
ceph: let the set_layout ioctl set single traits
Revert "ceph: don't truncate dirty pages in invalidate work thread"
ceph: replace leading spaces with tabs
libceph: warn on msg allocation failures
libceph: don't complain on msgpool alloc failures
libceph: always preallocate mon connection
libceph: create messenger with client
ceph: document ioctls
ceph: implement (optional) max read size
ceph: rename rsize -> rasize
ceph: make readpages fully async
Diffstat (limited to 'drivers/ata/libata-scsi.c')
0 files changed, 0 insertions, 0 deletions