From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Feb 2011 18:10:37 +0000 (-0800)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.38-rc5~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=15a831f253c8714181f9dddc204fb6592d61bc92;p=users%2Fjedix%2Flinux-maple.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:
  Revert "dt: add documentation of ARM dt boot interface"
---

15a831f253c8714181f9dddc204fb6592d61bc92