diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-12-15 20:33:22 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-15 20:33:28 +0100 |
commit | ab1eebe77dd08b26585860d534e07810d1cd274d (patch) | |
tree | 92b1ff0952cbdeef34922c43ff7eaac2162e77c4 /arch/arm/plat-omap/dma.c | |
parent | 186a25026c44d1bfa97671110ff14dcd0c99678e (diff) | |
parent | df59e7bf439918f523ac29e996ec1eebbed60440 (diff) |
Merge branch 'x86/asm' into x86/urgent
Merge reason: it's stable so lets push it upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
0 files changed, 0 insertions, 0 deletions