Merge branch 'sglist-arch' into for-linus

author Jens Axboe <jens.axboe@oracle.com>

Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)

committer Jens Axboe <jens.axboe@oracle.com>

Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
author Jens Axboe <jens.axboe@oracle.com>
Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
committer Jens Axboe <jens.axboe@oracle.com>
Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
diff --cc Documentation/DMA-mapping.txt
Simple merge
diff --cc drivers/block/cciss.c
Simple merge
author	Jens Axboe <jens.axboe@oracle.com>
	Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
committer	Jens Axboe <jens.axboe@oracle.com>
	Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
		1	2
Documentation/DMA-mapping.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/cciss.c	patch \|	diff1 \|	diff2 \|	blob \| history