[GIT PULL] ARM: OMAP2+: clean up and standardize WFI handling for 3.9

Paul Walmsley paul at pwsan.com
Mon Feb 11 12:45:09 EST 2013


On Mon, 11 Feb 2013, Tony Lindgren wrote:

> This branch should probably have been based on your earlier PM branch
> based on v3.8-rc5 that was already merged as omap-for-v3.9/pm-signed into
> arm-soc for-next.
> 
> Now merging this branch based on v3.8-rc6 requires me to create a merge
> base by merging the earlier branch with v3.8-rc6 and then resolving
> the self-inflicted merge conflict in order for me to generate a pull request
> without a non-trivial merge conflict. Just a bunch of extra hassle to
> deal with with additional risk of merging things wrong. Anyways merging
> into omap-for-v3.9/pm-wfi-take2.

Sorry about that.  Will try to find better merge bases for future 
branches.  

- Paul



More information about the linux-arm-kernel mailing list