Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755384Ab3I3L27 (ORCPT ); Mon, 30 Sep 2013 07:28:59 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:38246 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755258Ab3I3L2M (ORCPT ); Mon, 30 Sep 2013 07:28:12 -0400 From: Thierry Reding To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: x86@kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the tip tree Date: Mon, 30 Sep 2013 13:26:11 +0200 Message-Id: <1380540373-25352-9-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1380540373-25352-1-git-send-email-treding@nvidia.com> References: <1380540373-25352-1-git-send-email-treding@nvidia.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 378 Lines: 13 Today's linux-next merge of the tip tree got conflicts in arch/h8300/include/asm/Kbuild I just removed the file. Thanks, Thierry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/