| commit | 695884fb8acd9857e0e7120ccb2150e30f4b8fef | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Tue Feb 22 18:24:26 2011 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Tue Feb 22 18:41:48 2011 +0100 |
| tree | 49aa424c1a021ce432e9fa5ea29d37a23e4e30cc | |
| parent | 5df91509d324d44cfb11e55d9cb02fe18b53b045 [diff] | |
| parent | 04bea68b2f0eeebb089ecc67b618795925268b4a [diff] |
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>