| commit | 9bc432f761e265d48cdf350e5df2aab875a7d3a0 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Mon Apr 28 11:47:14 2014 -0700 |
| committer | Tim Murray <timmurray@google.com> | Mon Apr 28 11:47:14 2014 -0700 |
| tree | 0062a7d49708f34c143c94772a7ae47ed42d5084 | |
| parent | 605f08288fd07492db85eee9e15688b7ff3fcc13 [diff] | |
| parent | 4e0cc51d7974029aa2bbffce08e2c878f529f98a [diff] |
Merge remote-tracking branch 'upstream/master' into rebase Conflicts: lib/Transforms/Scalar/GlobalMerge.cpp Change-Id: I02f69818322294009535b485e8840c88de655325