diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-12-15 20:33:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-15 20:33:53 +0100 |
commit | bf08b3b1a1d06e92036a0c4f144b64fe6be2bffa (patch) | |
tree | da227906ed08546b9cb09c59d92c0b766a1aea8e /arch/arm/mach-mmp/ttc_dkb.c | |
parent | ab1eebe77dd08b26585860d534e07810d1cd274d (diff) | |
parent | 6ac5c5310ca9d7dd3d7e677c2715b1f06a348330 (diff) |
Merge branch 'x86/mce' into x86/urgent
Merge reason: Leftover mini-topic from the merge window - merge it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-mmp/ttc_dkb.c')
0 files changed, 0 insertions, 0 deletions