| commit | 2cc74dc89214d6bcc7e22beab0e778342c56eee6 | [log] [tgz] |
|---|---|---|
| author | Daniel Mentz <danielmentz@google.com> | Sat Mar 22 17:15:16 2014 -0700 |
| committer | Daniel Mentz <danielmentz@google.com> | Sat Mar 22 17:15:16 2014 -0700 |
| tree | 6e627a2149b089a3b5a2858a65078cccc8a2387a | |
| parent | 69b41f9e95e64394a90c784814b9c6f0af7a5a2e [diff] | |
| parent | 0a186d22995a5a2d358380f379bc186d4e15eec8 [diff] |
Merge branch SDK 3.1-rc4 into HEAD Conflicts: arch/arm/lib/bootb.c drivers/mtd/nand/comcerto_nand.c drivers/net/comcerto/Kconfig Change-Id: I0e950228fb7dde81e333dd16f6c877a7552a8142