Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* '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

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/block/xsysace.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
index 48330e0fd488f241fa267b23484b5357e8aefc12,b532d613fb5bf0b7b5af8e20c44d81e7200607d4..3822b4f49c84a360145a085e329fe0b76df4d47c
--- 1/drivers/char/ipmi/ipmi_si_intf.c
--- 2/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@@ -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;

diff --cc drivers/edac/mpc85xx_edac.c
Simple merge

diff --cc drivers/infiniband/hw/ehca/ehca_main.c
Simple merge

diff --cc drivers/mmc/host/sdhci-of-core.c
Simple merge

diff --cc drivers/mtd/maps/physmap_of.c
Simple merge

diff --cc drivers/pcmcia/m8xx_pcmcia.c
Simple merge

diff --cc sound/soc/fsl/mpc5200_psc_ac97.c
Simple merge

diff --cc sound/soc/fsl/mpc5200_psc_i2s.c
Simple merge