linux-next: manual merge of the akpm tree with the block tree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the akpm tree got a conflict in
drivers/block/cciss.c between commit ab5dbebe33e0 ("cciss: add small
delay when using PCI Power Management to reset for kump") from the block
tree and commit c9e69629e873 ("cciss: add half second delay to PCI PM
reset code") from the akpm tree.

These are essentially the same patch, so I dropped the akpm tree one.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature