As Rolf pointed out, this patch wasn't needed on the trunk - just the 1.7 branch. Sigh

This commit was SVN r30544.

opal/class/opal_hotel.h

@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2012-2013 Cisco Systems, Inc. All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC. All rights reserved
- * Copyright (c) 2014      Intel, Inc. All rights reserved
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -56,7 +55,6 @@
 #include "opal/prefetch.h"
 #include "opal/class/opal_object.h"
 #include "opal/mca/event/event.h"
-#include "opal/prefetch.h"
 
 BEGIN_C_DECLS