mogami board cleanup part 1 and preparing for 2.6.35

Change-Id: I85d09ca94f73b6d1f776e3b540354d6023bda79f