Merge branch 'master' of git@git.moblin.org:powertop v1.13
authorAuke Kok <auke-jan.h.kok@intel.com>
Mon, 19 Jul 2010 23:08:21 +0000 (16:08 -0700)
committerAuke Kok <auke-jan.h.kok@intel.com>
Mon, 19 Jul 2010 23:08:21 +0000 (16:08 -0700)
commitf5d9a3315040654a2c83d81b126b7d6a3d376500
tree20607b69588866c831540704bbce2a9fc159e5f2
parent702ce1b7e9a8ba9a684c114704621babb3e4a21d
parent9f4efd1c7cc0bc9a9078fa6b83a98763a7637e2f
Merge branch 'master' of git@git.moblin.org:powertop