Merge branch 'master' into for-2.6.35

Conflicts:
	fs/block_dev.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe 2010-04-29 09:36:24 +02:00
commit 7407cf355f
486 changed files with 7888 additions and 3098 deletions