Merge branch 'sglist-arch' into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 16 Oct 2007 10:29:34 +0000 (12:29 +0200)
1  2 
Documentation/DMA-mapping.txt
drivers/block/cciss.c

Simple merge
Simple merge