lkml.org 
[lkml]   [2013]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm-soc tree with the pm tree
On 04/24/13 15:54, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 ("cpuidle:
> remove en_core_tk_irqen flag") from the pm tree and commit 2eb89f893e44
> ("ARM: EXYNOS: factor out the idle states") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks OK to me, thanks.

- Kukjin


\
 
 \ /
  Last update: 2013-04-25 19:01    [W:0.035 / U:2.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site