From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753796AbbHWXzw (ORCPT ); Sun, 23 Aug 2015 19:55:52 -0400 Received: from ozlabs.org ([103.22.144.67]:42451 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753637AbbHWXzv (ORCPT ); Sun, 23 Aug 2015 19:55:51 -0400 Date: Mon, 24 Aug 2015 09:55:48 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shailendra Verma , "Rafael J. Wysocki" , Krzysztof Kozlowski , Kukjin Kim , Bartlomiej Zolnierkiewicz Subject: linux-next: manual merge of the arm-soc tree with Linus' tree Message-ID: <20150824095548.6bb25c3a@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-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 Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: drivers/cpufreq/exynos-cpufreq.c between commit: 62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match") from Linus' tree and commits: ac4c90c82e4d ("cpufreq: exynos: remove exynos5250 specific cpufreq driver support") 966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support") from the arm-soc tree. I fixed it up (the latter commit 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