]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)

Trivial merge