tree 866b154be0e7ff540d34713f34d9ee2678a77c31
parent f2554e3646e5f726b812c10cc91ca50964037255
parent 2c2d815969db5bcf6d9bb736f5e9588bb8a7f001
author Daniel Mentz <danielmentz@google.com> 1390531604 -0800
committer Daniel Mentz <danielmentz@google.com> 1390534449 -0800

Merge branch 'mindspeed_drops' into HEAD

Conflicts:
	arch/arm/mach-comcerto/comcerto-2000.c
	drivers/mtd/nand/comcerto_nand.c

Enable CONFIG_SUSPEND because the new Mindspeed kernel would not compile
without it.

Change-Id: I336163cf5b3de56e4d38a135dd05d0e75c9ad2b2