tree a6de80eed5413b32cf41bcb73d108a8f11253c8e
parent 7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2
parent a74ea43df1afc68f265c0ac2cb64031d855ae97b
author Linus Torvalds <torvalds@linux-foundation.org> 1299124917 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299124917 -0800

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

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
  x86: OLPC: have prom_early_alloc BUG rather than return NULL
  of/flattree: Drop an uninteresting message to pr_debug level
  of: Add missing of_address.h to xilinx ehci driver