Merge branch 'for-2.6.38/core' into for-next
authorJens Axboe <jaxboe@fusionio.com>
Thu, 16 Dec 2010 16:54:32 +0000 (17:54 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 16 Dec 2010 16:54:32 +0000 (17:54 +0100)

Trivial merge