Merge branch 'master' into lennydebian/3.0.10-dfsg-2bpo50+1

Conflicts:
	debian/changelog

1 files changed, 0 insertions, 50 deletions

diff --git a/src/VBox/Runtime/include/internal/mp.h b/src/VBox/Runtime/include/internal/mp.h
deleted file mode 100644
index 8b74e4ffc..000000000
--- a/src/VBox/Runtime/include/internal/mp.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id: mp.h $ */
-/** @file
- * IPRT - MP Internal header.
- */
-
-/*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * The contents of this file may alternatively be used under the terms
- * of the Common Development and Distribution License Version 1.0
- * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
- * VirtualBox OSE distribution, in which case the provisions of the
- * CDDL are applicable instead of those of the GPL.
- *
- * You may elect to license modified versions of this file under the
- * terms and conditions of either the GPL or the CDDL or both.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
- */
-
-#ifndef ___internal_mp_h
-#define ___internal_mp_h
-
-#include <iprt/cdefs.h>
-#include <iprt/param.h>
-
-RT_C_DECLS_BEGIN
-
-/**
- * Clears any pending poke DPC
- *
- * Currently only valid for Windows hosts.
- *
- */
-void rtMpPokeCpuClear();
-
-RT_C_DECLS_END
-
-#endif
-