rollup merge of #22332: dotdash/llvmup_20150213

Fixes the crash blocking #21886.
This commit is contained in:
Alex Crichton 2015-02-17 15:14:18 -08:00
commit 02c276175a
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 4891e6382e3e8aa89d530aa18427836428c47157
Subproject commit 2089cab13e7f92b487ba0dc1df9f6c05116b004a

View file

@ -1,4 +1,4 @@
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
# The actual contents of this file do not matter, but to trigger a change on the
# build bots then the contents should be changed so git updates the mtime.
2015-02-12
2015-02-13