Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

Manual fixups to ARM ixp4xxx by hand.