merge Linus head tree into my drm tree and fix up conflicts
[linux-2.6] / arch / i386 / kernel / early_printk.c
1
2 #include "../../x86_64/kernel/early_printk.c"