| commit | 986836503e49ccf7e84b813715d344964ec93566 | [log] [tgz] |
|---|---|---|
| author | Philipp Reisner <philipp.reisner@linbit.com> | Fri Nov 09 14:18:43 2012 +0100 |
| committer | Philipp Reisner <philipp.reisner@linbit.com> | Fri Nov 09 14:20:23 2012 +0100 |
| tree | b3bea7428efde5b77096cef80e5b6bfee494cc12 | |
| parent | ccae7868b0c5697508a541c531cf96b361d62c1c [diff] | |
| parent | 328e0f125bf41f4f33f684db22015f92cb44fe56 [diff] |
Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6