Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6
authorPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:18:43 +0000 (14:18 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:20:23 +0000 (14:20 +0100)

Trivial merge