From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2011 16:30:20 +0000 (-0700)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.39-rc1~88
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e264ac8cad5a3f2e717ac68eb300766eef61f568;p=linux.git

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()
---

e264ac8cad5a3f2e717ac68eb300766eef61f568