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)
commit3eed13fd933dbb81db12f7cdec6de9268c4443b5
treec16913706acffd4a0b29ec12cd68906b708c9a8a
parenta39d113936370ba524fa9e34d6954c3625c8aa64
parent2c941a204070ab32d92d40318a3196a7fb994c00
Merge branch 'sglist-arch' into for-linus
Documentation/DMA-mapping.txt
drivers/block/cciss.c