Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 16:11:31 +0000 (09:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 16:11:31 +0000 (09:11 -0700)
commit58d4ea65b98f154f3326b038eecda32f90b46ea8
tree636aed413349dece12c08a4bd3d1fea0254976d8
parent26f0cf91813bdc8e61595f8ad6660251e2ee9cf6
parentfbe0f8348fd6c3d016a3f48756eb729b41a67c22
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
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