Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
Linus Torvalds [Thu, 12 Aug 2010 16:11:31 +0000 (09:11 -0700)]
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  mmc_spi: Fix unterminated of_match_table
  of/sparc: fix build regression from of_device changes
  of/device: Replace struct of_device with struct platform_device

1  2 
drivers/ata/sata_fsl.c
drivers/block/xsysace.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/edac/mpc85xx_edac.c
drivers/infiniband/hw/ehca/ehca_main.c
drivers/mmc/host/sdhci-of-core.c
drivers/mtd/maps/physmap_of.c
drivers/pcmcia/m8xx_pcmcia.c
sound/soc/fsl/mpc5200_psc_ac97.c
sound/soc/fsl/mpc5200_psc_i2s.c

Simple merge
Simple merge
@@@ -2599,15 -2573,10 +2599,15 @@@ static int __devinit ipmi_of_probe(stru
  
        dev_set_drvdata(&dev->dev, info);
  
 -      return add_smi(info);
 +      if (add_smi(info)) {
 +              kfree(info);
 +              return -EBUSY;
 +      }
 +
 +      return 0;
  }
  
- static int __devexit ipmi_of_remove(struct of_device *dev)
+ static int __devexit ipmi_of_remove(struct platform_device *dev)
  {
        cleanup_one_si(dev_get_drvdata(&dev->dev));
        return 0;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge