[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120316145658.3fb06c5213dbca29d6898c4b@canb.auug.org.au>
Date: Fri, 16 Mar 2012 14:56:58 +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,
Masanari Iida <standby24x7@...il.com>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
<linuxppc-dev@...ts.ozlabs.org>
Subject: linux-next: manual merge of the trivial tree with the powerpc tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some
of the legacy iSeries specific device drivers") from the powerpc tree and
commit a7ccf3775219 ("char: Fix typo in viotape.c") from the trivial tree.
The former commit removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists