Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.37/drivers
authorJens Axboe <jaxboe@fusionio.com>
Sat, 23 Oct 2010 16:43:55 +0000 (18:43 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Sat, 23 Oct 2010 16:43:55 +0000 (18:43 +0200)

Trivial merge