Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
arch/sh/boards/mach-microdev/setup.c between commit
cee3e05ee0c727945280b754b3d4bfe0d7bcb622 ("sh: mach-microdev: Split out
the fdc37c93xapm initialization code") from the sh tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.
The former removed the code that the latter changed.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpv6I6KZ8MvL.pgp
Description: PGP signature
