Remove left-over support for Merced B-step CPUs as suggested by Jim
Wilson.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>