linux-next: manual merge of the trivial tree with the omap tree

[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 ("suspend: constify
platform_suspend_ops") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-omap2/pm24xx.c
index aaeea49,aa9764e..0000000
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -354,13 -326,7 +354,13 @@@ static void omap2_pm_finish(void
  	enable_hlt();
  }
  
 +static void omap2_pm_end(void)
 +{
 +	suspend_state = PM_SUSPEND_ON;
 +}
 +
- static struct platform_suspend_ops omap_pm_ops = {
+ static const struct platform_suspend_ops omap_pm_ops = {
 +	.begin		= omap2_pm_begin,
  	.prepare	= omap2_pm_prepare,
  	.enter		= omap2_pm_enter,
  	.finish		= omap2_pm_finish,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/