Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/dma/ioat/pci.c b/drivers/dma/ioat/pci.c
index 99ec26725bae..fab37d1cf48d 100644
--- a/drivers/dma/ioat/pci.c
+++ b/drivers/dma/ioat/pci.c
@@ -138,15 +138,10 @@ static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_devic
         if (err)
                 return err;
 
-        device = devm_kzalloc(dev, sizeof(*device), GFP_KERNEL);
-        if (!device)
-                return -ENOMEM;
-
-        pci_set_master(pdev);
-
         device = alloc_ioatdma(pdev, iomap[IOAT_MMIO_BAR]);
         if (!device)
                 return -ENOMEM;
+        pci_set_master(pdev);
         pci_set_drvdata(pdev, device);
 
         device->version = readb(device->reg_base + IOAT_VER_OFFSET);