Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752826AbbHJChe (ORCPT ); Sun, 9 Aug 2015 22:37:34 -0400 Received: from ozlabs.org ([103.22.144.67]:36720 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752362AbbHJChd (ORCPT ); Sun, 9 Aug 2015 22:37:33 -0400 Date: Mon, 10 Aug 2015 12:37:29 +1000 From: Stephen Rothwell To: Jiri Kosina , Mark Brown , Liam Girdwood Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: linux-next: manual merge of the trivial tree with the regulator tree Message-ID: <20150810123729.58c74531@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 726 Lines: 27 Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in: drivers/regulator/max77843.c between commit: 2a32b401a11f ("regulator: Remove the max77843 driver") from the regulator tree and commit: 971bd8fa369a ("treewide: Fix typo in printk") from the trivial tree. I fixed it up (the former removed the file, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au -- 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/