]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 01:22:04 +0000 (11:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 01:22:04 +0000 (11:22 +1000)
commit08de0b8e1ec9d8f64f55bca81e65812a1ac07d41
treebcbd2c16c84c5d0e3574f0de2542ddd93e4082a0
parent1177e9716dd8f4a5f091ef5ac433875cebb168f6
parented80a595d132f3d06a89da2719acc54ffecd6ef6
Merge remote-tracking branch 'ceph/master'

Conflicts:
drivers/block/rbd.c
drivers/block/rbd.c