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

From: Stephen Rothwell <hidden>
Date: 2011-12-28 05:29:07
Also in: lkml

Hi Greg,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Attachments

(unnamed) [application/pgp-signature] 836 bytes

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help