Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Jens Axboe 2010-10-19 09:13:04 +02:00
commit fa251f8990
1410 changed files with 18343 additions and 15037 deletions

Some files were not shown because too many files have changed in this diff Show more