Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus
Jens Axboe [Thu, 30 Jun 2011 08:10:50 +0000 (10:10 +0200)]

Trivial merge