| commit | 622d32d3ec40d5075523656ef0ea836f6a595ae3 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jens.axboe@oracle.com> | Wed Nov 04 18:38:23 2009 +0100 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Wed Nov 04 18:38:23 2009 +0100 |
| tree | d4c82d4f90ca0deb8fa806f105e204f2bdac2377 | |
| parent | 476d42f138ba82389a92a894d8a630a70d36278f [diff] | |
| parent | ed814525f2e45188964c270fc3a5a0b644f7e4a9 [diff] |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.33