linux-next: manual merge of the h8300-remove tree with Linus' tree
From: Stephen Rothwell
Date: Sun Sep 15 2013 - 19:56:53 EST
Hi Guenter,
Today's linux-next merge of the h8300-remove tree got a conflict in
arch/h8300/Kconfig between commit 0244ad004a54 ("Remove GENERIC_HARDIRQ
config option") from Linus' tree and commit d02babe847bf ("Drop support
for Renesas H8/300 (h8300) architecture") from the h8300-remove tree.
I just removed the file and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp00000.pgp
Description: PGP signature