Hi Igor, On Wed, 22 May 2013 15:53:32 +0200 Igor Mammedov <imammedo@xxxxxxxxxx> wrote: > > after fixing conflict between > 0902a9044 "Driver core: Use generic offline/online > for CPU offline/online" > > and > > 1c4e2d70a "cpu: make sure that cpu/online file created > before KOBJ_ADD is emitted" > > there was left some not needed remnants of the last > commit, remove them since the first commit does the > same thing in another way. > > Signed-off-by: Igor Mammedov <imammedo@xxxxxxxxxx> I have integrated this into my merge resolution, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpk4de4VY4Gb.pgp
Description: PGP signature
