Messages in this thread | | | Date | Wed, 4 Jan 2012 15:08:31 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the arm tree |
| |
On Wed, Dec 28, 2011 at 04:35:45PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/arm/mach-s5pv210/common.c between commit 37775320458e ("ARM: 7252/1: > restart: S5PV210: use new restart hook") from the arm tree and commit > 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from > the driver-core tree (where it is called arch/arm/mach-s5pv210/cpu.c). > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks good, thanks.
greg k-h
| |