FYI: Merge issue with linux-omap/master (due to merge 'omap-cleanup-for-v3.5')

Hi Tony,

Looks like we have an issue with the merge from branch "omap-cleanup-for-v3.5",

Patch (ARM: OMAP2+: am33xx: Make am33xx as a separate class) changes AM335X_CLASS to value 0x33500033 and then later merge commit (Merge tag 'omap-cleanup-for-v3.5' into tmp-merge) reverts it back to 0x33500034.

Due to this Kernel doesn't boot on BeagleBone platform, below change is required to boot it.

@@ -396,7 +394,7 @@ IS_OMAP_TYPE(3430, 0x3430)

#define AM35XX_REV_ES1_0 AM35XX_CLASS
#define AM35XX_REV_ES1_1 (AM35XX_CLASS | (0x1 << 8))

-#define AM335X_CLASS 0x33500034
+#define AM335X_CLASS 0x33500033

Thanks,
Vaibhav