Merge branch 'for-2.6.38/core' into for-next
Jens Axboe [Fri, 17 Dec 2010 08:00:46 +0000 (09:00 +0100)]
1  2 
block/genhd.c

diff --cc block/genhd.c
Simple merge