[PATCH] minor POWER6 cputable cleanup

[Michael Neuling]

> Merge CPU_FTR_POWER6 and CPU_FTR_POWER6X definitions.

After talking to paulus offline, it looks like POWER6X isn't being used.
I'll post a new patch to remove it.

Mikey