[PATCH] i386: espfix cleanup