Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
commitbd1a643e10eb8782b36b47c3602300319dd2fb00
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 22:41:10 +0000 (14 15:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 22:41:10 +0000 (14 15:41 -0700)
tree68915b6c23f07441ebc956a3492cd0a0797a7d8d
parent9f6bd36c407f30c388c5de66c831e1968eec0367
parent1fec70932d867416ffe620dd17005f168cc84eb5
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:
  rbd: fix split bio handling
  rbd: fix leak of ops struct