[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20130703152906.872979a7f0af80287e827920@canb.auug.org.au>
Date: Wed, 3 Jul 2013 15:29:06 +1000
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,
"Uwe Kleine-König"
<u.kleine-koenig@...gutronix.de>,
Thomas Gleixner <tglx@...utronix.de>
Subject: linux-next: manual merge of the trivial tree with Linus' tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
kernel/irq/generic-chip.c between commit ccc414f83914 ("genirq: Add the
generic chip to the genirq docbook") from Linus' tree and commit
37074c5a1b99 ("irq/generic-chip: fix a few kernel-doc entries") from the
trivial tree.
I fixed it up (I just arbitrarily used Linus' tree version) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists