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

From: Stephen Rothwell
Date: Wed Dec 16 2009 - 21:08:20 EST

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
kernel/perf_event.c between commit
0f624e7e5625f4c30c836b7a5decfe2553582391 ("perf_event: Fix incorrect
range check on cpu number") from Linus' tree and commit
("cpumask:kernel_perf_event-deprecated-function") from the rr tree.

Overlapping changes. I used the version from Linus' tree (since it was a
bug fix).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature