[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100208154808.b5670cd5.sfr@canb.auug.org.au>
Date: Mon, 8 Feb 2010 15:48:08 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Daniel Mack <daniel@...aq.de>,
Manuel Lauss <manuel.lauss@...glemail.com>,
Yoichi Yuasa <yuasa@...ux-mips.org>,
Ralf Baechle <ralf@...ux-mips.org>
Subject: linux-next: manual merge of the trivial tree with the tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/mips/alchemy/common/reset.c between commit
139047ceae71916626ee36bea9ef35f1030aabfe ("MIPS: Alchemy: get rid of
common/reset.c") from the tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.
The former removes the file updated by the latter.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists