Merge branch 'master' into for-2.6.33
authorJens Axboe <jens.axboe@oracle.com>
Thu, 3 Dec 2009 12:49:39 +0000 (13:49 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 3 Dec 2009 12:49:39 +0000 (13:49 +0100)

Trivial merge