Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Feb 2011 18:10:37 +0000 (10:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Feb 2011 18:10:37 +0000 (10:10 -0800)
commit15a831f253c8714181f9dddc204fb6592d61bc92
treebfb0bc4c5b96037234566ea7abb91d1464805865
parentf1b6a4ec27f3c789c15a157590295c501b0a1c58
parent7211da17785536bacd3171a28bc6a3853c8bb477
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"