linux-next: manual merge of the idle tree with the pm tree
From: Stephen Rothwell
Date: Mon Apr 13 2015 - 22:47:30 EST
Today's linux-next merge of the idle tree got a conflict in
tools/power/x86/turbostat/turbostat.c between commits from the pm tree
and similar commits from the idle tree.
There seem to be two differnet version of these patches, so I just
dropped the idle tree for today, please sort this out.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: OpenPGP digital signature