Bug 915687 - Watch for type objects with lazy protos when merging off thread parses, r=billm.
Bug 915482 (part 3) - Move some functions out of vm/Shape-inl.h, jsfuninlines.h and jsinferinlines.h.  r=terrence.

--HG--
extra : rebase_source : b2d3805b897d54162eeaeedbd41545b23fd589ba
Bug 915891 - SpiderMonkey: Miscellaneous x86 assembler spew fixes. r=sstangl
Bug 915833 - Prefix REG_DISP, SCALE, and ADDRESS with "MEM_" to emphasize that they are memory operand kinds, as opposed to REG which is not. r=sstangl
Bug 915833 - SpiderMonkey: Use disp_ instead of base_ for storing a 32-bit immediate address, and reorder fields for consistency between x86 and x64. r=sstangl
Bug 915833 - SpiderMonkey: Make some fields private. r=sstangl
Bug 915833 - SpiderMonkey: Add support for immediate addresses on x64. r=sstangl
Backed out changeset 4b84bbad669d
Backed out changeset 492fdd7c06fd (bug 914182) for Marionette failures
Bug 915832, don't trigger a new GC if we're in middle of an iGC, r=billm
Bug 915625 - Watch for NULL inner windows in AttemptAsyncScriptParse.
Bug 877658 - Exactly root tools/profiler/; r=BenWa

--HG--
extra : rebase_source : a7c5bbcb64d7b670e170e3c20dda53d03a4f2cc1