Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2012 21:25:55 +0000 (13:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2012 21:25:55 +0000 (13:25 -0800)
commit81d48f0aee544885c39ef6e1ffb1175f276e6adf
tree093f37084c133795e4ce71befa57185328737171
parentf5e4e20faa1eee3feaa0394897bbd1aca544e809
parent661db794eb8179c7bea02f159bb691a2fff4a8e0
parent14c173eb63432ba5d0783b6c4b23a8fe0c76fb0f
Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

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
drivers/spi/Kconfig