linux-next: manual merge of the driver-core tree with Linus' tree
From: Stephen Rothwell
Date: Wed Dec 28 2011 - 00:29:24 EST
Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s3c64xx/s3c6400.c between commit 71b33a4f7c86 ("ARM:
S3C64XX: Staticise s3c6400_sysclass") from Linus' tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core tree.
The latter subsumed the change in the former, so I used that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature