Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753691Ab3JALKJ (ORCPT ); Tue, 1 Oct 2013 07:10:09 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:35535 "EHLO mail-bk0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753485Ab3JALJW (ORCPT ); Tue, 1 Oct 2013 07:09:22 -0400 From: Thierry Reding Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the random tree Date: Tue, 1 Oct 2013 13:07:22 +0200 Message-Id: <1380625644-11331-6-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <20131001110344.GA20249@ulmo.nvidia.com> References: <20131001110344.GA20249@ulmo.nvidia.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 738 Lines: 27 Today's linux-next merge of the random tree got a conflict in: init/main.c I fixed it up (see below). Please check if the resolution looks correct. Thanks, Thierry --- diff --cc init/main.c index 7cc4b78,586cd33..379090f --- a/init/main.c +++ b/init/main.c @@@ -75,7 -75,7 +75,8 @@@ #include #include #include +#include + #include #include #include -- 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/