Hi Anton,

On Mon, 18 Jun 2012 22:10:32 -0700 Anton Vorontsov [off-list ref] wrote:

Thanks for noticing, Stephen! Although, I wonder what would be the
best way to fix this?.. I would happily cherry-pick the ACPI change
into my tree and then re-apply the battery thermal zone support patch,
but ACPI change doesn't apply cleanly on the battery tree. Heh.

Is there thermal zone git tree? Or maybe I would just let ACPI
folks take the battery patch in question?

Just wait until the next merge window and then who ever get's Linus to
merge their tree last can tell him to fix this in the merge commit.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au