Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konra...
authorJens Axboe <jaxboe@fusionio.com>
Tue, 23 Aug 2011 13:09:13 +0000 (15:09 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 23 Aug 2011 13:09:13 +0000 (15:09 +0200)

Trivial merge