]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ceph/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:35:27 +0000 (11:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:35:27 +0000 (11:35 +1000)
commit971a7c5e1ba20f65094e07dda5309a4d89e66482
treed280322f7bdf79ac9a30aef2a73ec9cb193ee02f
parent1e1ef983ee10dff893e704e2ea53348c640952b2
parent60fc6ea8e686f0fca6e315239e8c045352c00718
Merge remote-tracking branch 'ceph/master'

Conflicts:
drivers/block/rbd.c
drivers/block/rbd.c
fs/ceph/file.c