Merge branch 'master' of git://github.com/fenrus75/powertop.git

Signed-off-by: Sanjay Singh Rawat <sanjay.rawat@linaro.org>