Merge branch 'for-2.6.38/core' into for-next
authorJens Axboe <jaxboe@fusionio.com>
Mon, 20 Dec 2010 08:17:35 +0000 (09:17 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Mon, 20 Dec 2010 08:17:35 +0000 (09:17 +0100)

Trivial merge