On Mon, 13 Dec 2010, Stephen Rothwell wrote:
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-omap2/pm24xx.c between commit
e83df17f178360a8e7874441bca04a710c869e42 (OMAP2+: PM/serial: fix console
semaphore acquire during suspend) from the omap tree and
Hi Jiri,
On Mon, 13 Dec 2010 11:01:59 +0100 (CET) Jiri Kosina jkos...@suse.cz wrote:
Thank you Stephen. If you could carry this fixup patch, then it seems best
option for me. This conflict is trivial enough to be resolved later during
merge.
Yep, no worries.
--
Cheers,
Stephen Rothwell
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-omap2/pm24xx.c between commit
e83df17f178360a8e7874441bca04a710c869e42 (OMAP2+: PM/serial: fix console
semaphore acquire during suspend) from the omap tree and commit
2f55ac072f5344519348c0c94b3d2f4cca46847b
