From 4ffde0814f43076c944f46890e0b6d401de92ca4 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 21 Jan 2015 09:23:27 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/thread_local/mod.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libstd/thread_local')

diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index 24e46d8d88e..f7a2f8e10e9 100644
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@@ -459,6 +459,7 @@ mod imp {
 
     use cell::UnsafeCell;
     use mem;
+    use ptr;
     use sys_common::thread_local::StaticKey as OsStaticKey;
 
     #[doc(hidden)]
-- 
cgit 1.4.1-3-g733a5