diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 09:38:53 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 09:39:00 (GMT) |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /arch/cris/kernel/vmlinux.lds.S | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
| download | linux-fsl-qoriq-8dd8997d2c56c9f248294805e129e1fc69444380.tar.xz | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/cris/kernel/vmlinux.lds.S')
0 files changed, 0 insertions, 0 deletions