Commit 98b4a91d184480aff438bcfa7683ede951512b9e

Fix last merge commit e118f0477f37f561a391aa9686be0e32b86f0092

Fix merging from beagle-donut-0x3 to master.
  
6969 CPU_PPC64_PA6T, /**< ppc64 PA6T */
7070 CPU_ARM_MPCORE, /**< ARM MPCore */
7171 CPU_ARM_V6, /**< ARM V6 */
72 CPU_ARM_V7, /**< ARM V7 */
7372 CPU_PPC64_POWER5pp, /**< ppc64 Power5++ family */
7473 CPU_PPC_E300, /**< e300 */
7574 CPU_AVR32, /**< AVR32 */