summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2012-11-09 14:18:43 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-09 14:20:23 +0100
commit986836503e49ccf7e84b813715d344964ec93566 (patch)
treeb3bea7428efde5b77096cef80e5b6bfee494cc12 /init
parentccae7868b0c5697508a541c531cf96b361d62c1c (diff)
parent328e0f125bf41f4f33f684db22015f92cb44fe56 (diff)
Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions