From: Linus Torvalds Date: Thu, 3 Mar 2011 04:01:57 +0000 (-0800) Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f7d222ea2ac7aebf1ac06a76e7739ed17480fd38;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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: 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 --- f7d222ea2ac7aebf1ac06a76e7739ed17480fd38