| commit | 57448a7382732271bd0fe312853233956e7e7700 | [log] [tgz] |
|---|---|---|
| author | John Newlin <jnewlin@google.com> | Fri May 31 14:29:34 2013 -0700 |
| committer | John Newlin <jnewlin@google.com> | Fri May 31 14:53:52 2013 -0700 |
| tree | 3babebcae7571ff5f3a7b8fe75444db25c64cf6f | |
| parent | 172adf3157a02d4310c2ffd7ec76f72ebd85c00b [diff] | |
| parent | 32248e7f4477323c3e4907e45d089e640068415d [diff] |
Merge commit '32248e7f4477323c3e4907e45d089e640068415d' into merge2 git merge -s ours 32248e7f4477323c3e4907e45d089e640068415d This tree was not initially merged from vendor_drops, so there is no common base for merging, which makes things sort of complicated. This merge --ours gives this branch that common base so that new drops from Marvell can be merged in easier. It will make any new rebase very hard though. Change-Id: Id9d21f606ea760e47ad15575651ab9b18d359eb8