linux-next: manual merge of the tip tree with the tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/kernel/i8253.c between commit 2b9b7cd782a5 ("clocksource:
convert mips to generic i8253 clocksource") from the arm tree and commit
75c4fd8c7862 ("mips: convert 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: pgp00000.pgp
Description: PGP signature