linux-next: manual merge of the ide tree

Hi Bart,

Today's linux-next merge of the ide tree got a conflict in
drivers/ide/ide.c between commits
2b54ed9467697b0ce2d60d89e5e4253c9e322c26 ("ide: ide_unregister() locking
bugfix"), bd8a59e29726b2a5ff7baefe995febdc63044a61 ("ide: ide_unregister
() warm-plug bugfix") and 7cd95f56cb61f5348d062527c9d3653196f6e629 ("ide:
fix hwif->gendev refcounting") from Linus' tree (which all exist in the
ide tree as well) and bits from the ide tree (since it does more work in
the same areas).

I took the ide tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/