From f13c12256178c0f3f0067ab74d5f117cd61ebced Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 30 Mar 2017 23:18:13 +0200
Subject: [PATCH] rebase micropython, min_time -> peektime

---
 src/trezor/loop.py | 2 +-
 vendor/micropython | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/trezor/loop.py b/src/trezor/loop.py
index 0c445615e..b8f8bb0e2 100644
--- a/src/trezor/loop.py
+++ b/src/trezor/loop.py
@@ -92,7 +92,7 @@ def run_forever():
         # compute the maximum amount of time we can wait for a message
         if _scheduled_tasks:
             delay = utime.ticks_diff(
-                _scheduled_tasks.min_time(), utime.ticks_us())
+                _scheduled_tasks.peektime(), utime.ticks_us())
         else:
             delay = _MAX_SELECT_DELAY
 
diff --git a/vendor/micropython b/vendor/micropython
index bf2d7b109..6e6c01b97 160000
--- a/vendor/micropython
+++ b/vendor/micropython
@@ -1 +1 @@
-Subproject commit bf2d7b10934242b56833d30a91d0ce1beae097e0
+Subproject commit 6e6c01b97189a95b59a037fa7dabcf8217f199af