On Monday 06 July 2009, Michal Simek wrote:
> Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the suspend tree got a conflict in
> > arch/microblaze/include/asm/device.h between commit
> > 19aff4132a289ec83ca6eee8b3db28855b9f06af ("microblaze: Adding
> > dev_arch_data functions") from the microblaze tree and commit
> > c959b4101b10723eeb190ef2e82765dd529c26b6 ("Driver Core: Add platform
> > device arch data V3") from the suspend tree.
> >
> > Just overlapping additions. I fixed it up (see below) and can carry the
> > fix as necessary.
> >
> I'll revert this patch and I'll add it later.
> Rafael you don't need to do any changes. I'll do them.
> This John L patch is not important - just for any drivers which are not
> in mainline.
> I'll add it later.
Many thanks!
Best,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
