am b15cbd16: am 8addd1f1: am 65e3b69b: Merge "Move modify_ldt_lock into global lock order."

* commit 'b15cbd16c062af85bbfe12019f7e7a2f5bd2fe5a':
  Move modify_ldt_lock into global lock order.