Hi Len, 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. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpn2iXL3O6Zl.pgp
Description: OpenPGP digital signature
