| commit | ff228135a30e909640f1dd6f8de48735aaf10a98 | [log] [tgz] |
|---|---|---|
| author | Daniel Mentz <danielmentz@google.com> | Thu Jan 23 18:46:44 2014 -0800 |
| committer | Daniel Mentz <danielmentz@google.com> | Thu Jan 23 19:34:09 2014 -0800 |
| tree | 866b154be0e7ff540d34713f34d9ee2678a77c31 | |
| parent | f2554e3646e5f726b812c10cc91ca50964037255 [diff] | |
| parent | 2c2d815969db5bcf6d9bb736f5e9588bb8a7f001 [diff] |
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