linux-next: manual merge of the mips tree with Linus' tree

[Stephen Rothwell]

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/perf_event.c between commit e5dcb58aa510 ("MIPS: perf:
Reorganize contents of perf support files") from Linus' tree and commit
6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips tree.

The former moved the code that the latter modified and it appeasr to have
been fixed up in its new position.  So I just used the version of this
file that is in Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature