From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: linux-next: manual merge of the drm-intel tree
Date: Mon, 30 Sep 2013 13:32:38 +0200
Message-ID: <CAKMK7uHpz3AbsdxZR84AHDzAg9k3DHU8p81-jWD5samOq-2Naw@mail.gmail.com>
References: <1380540373-25352-1-git-send-email-treding@nvidia.com>
	<1380540373-25352-4-git-send-email-treding@nvidia.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-ie0-f172.google.com ([209.85.223.172]:45045 "EHLO
	mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754456Ab3I3Lcj (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 30 Sep 2013 07:32:39 -0400
Received: by mail-ie0-f172.google.com with SMTP id x13so9820993ief.17
        for <linux-next@vger.kernel.org>; Mon, 30 Sep 2013 04:32:39 -0700 (PDT)
In-Reply-To: <1380540373-25352-4-git-send-email-treding@nvidia.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>, linux-next <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, dri-devel <dri-devel@lists.freedesktop.org>

On Mon, Sep 30, 2013 at 1:26 PM, Thierry Reding
<thierry.reding@gmail.com> wrote:
> Today's linux-next merge of the drm-intel tree got conflicts in
>
>         drivers/gpu/drm/i915/intel_display.c
>
> I fixed it up (see below). Please check if the resolution looks correct.

Looks good.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch