diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 10:30:19 -0400 |
| commit | 10d3285d0b3af641ee446f0be8f0a7f40cb515b6 (patch) | |
| tree | 836ad323a1eae8a4bdd5ab5f5e4271efeb85cf8c /include/asm-x86/setup.h | |
| parent | 6dec3a10a7a6093af10cef7ac56021150afd6451 (diff) | |
| parent | 3a61ec387c9092dfc91a5959145d36835a72fc4c (diff) | |
Merge branch 'x86/urgent' into x86/core
Conflicts:
include/asm-x86/gpio.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/setup.h')
0 files changed, 0 insertions, 0 deletions