Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
authorJens Axboe <jaxboe@fusionio.com>
Mon, 14 Jun 2010 10:54:57 +0000 (12:54 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Mon, 14 Jun 2010 10:54:57 +0000 (12:54 +0200)
commit575f552012ec0cd6591fd85ee996d5a5ad1a669a
tree86b9882f04e75e2fb1046f9c82f8c82c86810c80
parent29cb48594b873f6193d6327097e504bd3e2314de
parentdc66c74de6f4238020db3e2041d4aca5c5b3e9bc
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus