linux-next: manual merge of the tip tree with the pm tree

From: Stephen Rothwell
Date: Mon Mar 14 2016 - 21:55:51 EST

Hi all,

Today's linux-next merge of the tip tree got a conflict in:


between commit:

58cc30a4e608 ("tools/power turbostat: fix compiler warnings")

from the pm tree and commit:

1b69317d2dc8 ("tools/power turbostat: fix various build warnings")

from the tip tree.

I fixed it up (I arbitrarily used the pm tree version) and can carry
the fix as necessary (no action is required).

Stephen Rothwell