From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770AbdCAKpO (ORCPT ); Wed, 1 Mar 2017 05:45:14 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48458 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968AbdCAKnE (ORCPT ); Wed, 1 Mar 2017 05:43:04 -0500 Date: Wed, 1 Mar 2017 01:55:23 -0800 From: tip-bot for Masanari Iida Message-ID: Cc: tglx@linutronix.de, standby24x7@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, standby24x7@gmail.com, tglx@linutronix.de In-Reply-To: <20170227122922.26230-1-standby24x7@gmail.com> References: <20170227122922.26230-1-standby24x7@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/vmware: Remove duplicate inclusion of asm/timer.h Git-Commit-ID: aa5ec3f715d576353c7d8f4f8085634bd845b73f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: aa5ec3f715d576353c7d8f4f8085634bd845b73f Gitweb: http://git.kernel.org/tip/aa5ec3f715d576353c7d8f4f8085634bd845b73f Author: Masanari Iida AuthorDate: Mon, 27 Feb 2017 21:29:22 +0900 Committer: Thomas Gleixner CommitDate: Wed, 1 Mar 2017 10:51:40 +0100 x86/vmware: Remove duplicate inclusion of asm/timer.h Signed-off-by: Masanari Iida Cc: akataria@vmware.com Cc: virtualization@lists.linux-foundation.org Link: http://lkml.kernel.org/r/20170227122922.26230-1-standby24x7@gmail.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/vmware.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 891f4da..22403a2 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -30,7 +30,6 @@ #include #include #include -#include #undef pr_fmt #define pr_fmt(fmt) "vmware: " fmt