tree f6230e79ef751783d9a723c826dd64efde7d53c0
parent 200460067d19db4aab7f1d9f5c95dd644d260337
parent 06fb01fd1dc624d891cbe039a88a44bc8a8a9ec1
author Linus Torvalds <torvalds@linux-foundation.org> 1300984220 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300984220 -0700

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

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi/pl022: Add loopback support for the SPI on 5500
  spi/omap_mcspi: Fix broken last word xfer
  of/flattree: minor cleanups
  dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table
  dt: protect against NULL matches passed to of_match_node()
  dt: Refactor of_platform_bus_probe()