From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmIHl-00068m-1Z for barebox@lists.infradead.org; Mon, 19 May 2014 07:47:01 +0000 Date: Mon, 19 May 2014 09:46:38 +0200 From: Sascha Hauer Message-ID: <20140519074638.GC5858@pengutronix.de> References: <1400424390-24736-1-git-send-email-m.olbrich@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1400424390-24736-1-git-send-email-m.olbrich@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 0/4] some mini2440 updates To: Michael Olbrich Cc: barebox@lists.infradead.org On Sun, May 18, 2014 at 04:46:26PM +0200, Michael Olbrich wrote: > Hi, > > Some updates for the mini2440. This is based on next, is that ok? Generally I prefer patches on master and resolve the conflicts myself. > That's mostly relavant for the defconfig but dm9k.c has a small conflict as > well. Applied, thanks. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox