Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core
[safe/jmp/linux-2.6] / arch / x86 / kernel / probe_roms_32.c
2008-07-08 Yinghai Lux86: seperate probe_roms into another file