Hi Russell, On Fri, 6 Jan 2012 08:48:41 +0000 Russell King - ARM Linux wrote: > > On Fri, Jan 06, 2012 at 12:03:17PM +1100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/mach-omap2/pm34xx.c between commit e6ab10af962d ("ARM: OMAP: > > convert idle handlers from pm_idle to arm_pm_idle") from the arm tree and > > commit 2fd149645eb4 ("") from the arm-soc tree. > > Err, there's an empty description of a commit in the arm-soc tree? Sorry about that: ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qos -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/