Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.33
authorJens Axboe <jens.axboe@oracle.com>
Wed, 4 Nov 2009 17:38:23 +0000 (18:38 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 4 Nov 2009 17:38:23 +0000 (18:38 +0100)

Trivial merge