Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jul 2011 20:15:57 +0000 (13:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jul 2011 20:15:57 +0000 (13:15 -0700)
commit121782a248f11c63c7c0fc78d4a68a54e99ee37d
treefd2a93f961e472bf146c8b752ab303f612d93ed1
parenta8728d35549d3203a8cb0055b9d2c217a21ac7eb
parentd7f124f129a6aea99938e0d4172c741b56fefeda
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: fix sync and dio writes across stripe boundaries
  libceph: fix page calculation for non-page-aligned io
  ceph: fix page alignment corrections