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

From: Stephen Rothwell
Date: Tue Jan 01 2013 - 18:55:58 EST

Hi all,

Today's linux-next merge of the s390 tree got a conflict in
arch/s390/kernel/smp.c between commit c8925a6e95b2 ("ARCH: drivers remove
__dev* attributes") from the driver-core.current tree and commit
5059e4342f93 ("s390/smp: fix section mismatch for smp_add_present_cpu()")
from the s390 tree.

I fixed it up (I used the s390 tree version) and can carry the fix as
necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature