Pull miscellaneous into release branch

Conflicts:

	arch/ia64/kernel/mca.c