linux-next: manual merge of the ide tree

Hi Bart,

Today's linux-next merge of the ide tree got conflicts in
drivers/ide/ide-iops.c and drivers/ide/ide-dma.c between commits
367fdcb4e401161e51aaee5d06b3f82098bafefc ("ide: fix pre-EIDE SWDMA
support on big-endian") and 242f44261e6c5fdc13e3cd12f949ab717dc37d58
("ide: fix ide_fix_driveid()") from Linus' tree (which are also in the
ide tree) and further changes in the ide tree.

This is just to let you know, there is not problem here.

I just used the versions from the ide tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/