aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/achware.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-06 10:18:26 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-06 12:06:53 -0400
commit0962f402af1bb0b53ccee626785d202a10c12fff (patch)
tree26fa57193f16e45c6e0557049d02164f129077ed /include/acpi/achware.h
parent19268ed7449c561694d048a34601a30e2d1aaf79 (diff)
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff)
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts: arch/x86/kernel/process_32.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi/achware.h')
0 files changed, 0 insertions, 0 deletions