Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git...

2nd set of device tree changes and SPI bug fixes for v3.3

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of/irq: Add interrupts-names property to name an irq resource
  of/address: Add reg-names property to name an iomem resource

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi/tegra: depend instead of select TEGRA_SYSTEM_DMA

diff --cc drivers/spi/Kconfig
index 561a832417b8968195638aba58edbfe3edd988e7,8ba4510a95195392da12a65ce641ea5f164f3c20,a1c468e25918feb5520a4439c8010d4ce8573ea3..3f9a47ec67dc814764bbee0d22bdd03f7680400a
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@ -87,8 -87,8 -87,8 +87,8 @@@@ config SPI_BFIN_SPOR
          Enable support for a SPI bus via the Blackfin SPORT peripheral.
   
   config SPI_AU1550
 --     tristate "Au1550/Au12x0 SPI Controller"
  -     depends on (SOC_AU1550 || SOC_AU1200) && EXPERIMENTAL
 ++     tristate "Au1550/Au1200/Au1300 SPI Controller"
  +     depends on MIPS_ALCHEMY && EXPERIMENTAL
        select SPI_BITBANG
        help
          If you say yes to this option, support will be included for the