From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 22 Feb 2011 17:24:26 +0000 (+0100)
Subject: Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86... 
X-Git-Tag: firefly_0821_release~7613^2~1385^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=695884fb8acd9857e0e7120ccb2150e30f4b8fef;p=firefly-linux-kernel-4.4.55.git

Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform

Reason: x86 devicetree support for ce4100 depends on those device tree
	changes scheduled for .39.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

695884fb8acd9857e0e7120ccb2150e30f4b8fef