Merge branch 'for-linus' into for-2.6.33
Jens Axboe [Tue, 13 Oct 2009 10:29:45 +0000 (12:29 +0200)]
1  2 
block/elevator.c

Simple merge