Merge branch 'for-linus' into for-next
authorJens Axboe <jaxboe@fusionio.com>
Mon, 15 Nov 2010 09:25:49 +0000 (10:25 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Mon, 15 Nov 2010 09:25:49 +0000 (10:25 +0100)

Trivial merge