projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5df9150 04bea68)
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 22 Feb 2011 17:24:26 +0000 (18:24 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 22 Feb 2011 17:41:48 +0000 (18:41 +0100)
Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
arch/x86/kernel/apb_timer.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/setup.c patch | diff1 | diff2 | blob | history
arch/x86/platform/mrst/mrst.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apb_timer.c
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
diff --cc arch/x86/platform/mrst/mrst.c
Simple merge
Domain: System / Kernel;