summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-05-19 09:46:00 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-05-19 09:46:00 +0200
commit779d530632c98967820d3bbcae15d492fc20301e (patch)
tree5911c12ead3c028d089e7a8be824f4d9f7590520 /drivers/block/drbd
parentc9ce9e438b2a9faba74a05a71b3dbe169cde783b (diff)
parent8ab521506c4dbb144f0c04c55e3d8bec42c1b2b9 (diff)
Merge branches 'for-jens/xen-backend-fixes' and 'for-jens/xen-blkback-v3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-2.6.40/drivers
Diffstat (limited to 'drivers/block/drbd')
0 files changed, 0 insertions, 0 deletions