Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/i8253.c between commit 3490f584b9ba ("clocksource:
convert x86 to generic i8253 clocksource") from the arm tree and
commitb01cc1b0eae0 ("x86: Convert remaining x86 clocksources to
clocksource_register_hz/khz") from the tip tree.
The former seems to supercede the latter, so I used the former.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpmv7OUkX_jy.pgp
Description: PGP signature
