From: Anton Blanchard <anton@samba.org>

Sync 2.4 & 2.6 cputable code.  Adds 970 and Power5 processor support
plus new firmware features.