commit | 6a7cc883d6ad95bb89282fc04e917c16d2b5584f | [log] [tgz] |
---|---|---|
author | Jens Axboe <jens.axboe@oracle.com> | Tue May 04 08:48:53 2010 +0200 |
committer | Jens Axboe <jens.axboe@oracle.com> | Tue May 04 08:48:53 2010 +0200 |
tree | d22aadedb814584b7305586feefbcb35345372de | |
parent | be1066bbcd443a65df312fdecea7e4959adedb45 [diff] | |
parent | 5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30 [diff] |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus