Date: Fri, 12 Feb 2010 10:29:07 +0100 (CET)
From: Jiri Kosina <jkosina@suse.cz>
To: Dave Airlie <airlied@linux.ie>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org,
       Adam Buchbinder <adam.buchbinder@gmail.com>,
       Alex Deucher <alexdeucher@gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the drm tree
In-Reply-To: <alpine.DEB.2.00.1002120440510.26950@skynet.skynet.ie>
Message-ID: <alpine.LNX.2.00.1002121028520.30967@pobox.suse.cz>
References: <20100212151223.21746bc7.sfr@canb.auug.org.au> <alpine.DEB.2.00.1002120440510.26950@skynet.skynet.ie>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 567
Lines: 19

On Fri, 12 Feb 2010, Dave Airlie wrote:

> > Hi Jiri,
> 
> Can we drop any cleanups to atombios.h?
> 
> This file comes from AMD and we normally drop it into place, so they just 
> get overwritten next time.

Thanks for letting me know, I have reverted the hunk touching this file.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/