Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.33
authorJens Axboe <jens.axboe@oracle.com>
Thu, 26 Nov 2009 08:46:51 +0000 (09:46 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 26 Nov 2009 08:46:51 +0000 (09:46 +0100)

Trivial merge