From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Sat, 16 Jan 2016 22:00:06 -0500 Subject: [U-Boot] [GIT PULL] u-boot-mips/master In-Reply-To: References: Message-ID: <20160117030006.GX3359@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Sat, Jan 16, 2016 at 09:45:19PM +0100, Daniel Schwierzeck wrote: > Hi Tom, > > please pull the first bunch of MIPS updates. > > There is a possible merge conflict in dts/Makefile due to my patch [1] > in this PR and Thomas' patch [2] waiting in u-boot-fdt tree. > > [1] http://patchwork.ozlabs.org/patch/566695/ > [2] http://patchwork.ozlabs.org/patch/563669/ > > > The following changes since commit 782acf7b52db6bec1a796773e3033b4afcd6c9e2: > > Merge git://git.denx.de/u-boot-rockchip (2016-01-15 08:11:15 -0500) > > are available in the git repository at: > > git://git.denx.de/u-boot-mips.git master > > for you to fetch changes up to 0e0efb40b874633360967f532eb1ed59ad02adbe: > > MIPS: implement bit manipulating I/O accessors (2016-01-16 21:06:46 +0100) > Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: