Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core
Jens Axboe [Tue, 16 Nov 2010 09:10:12 +0000 (10:10 +0100)]

Trivial merge