From: Len Brown <len.brown@intel.com>
Date: Wed, 12 Jan 2011 09:55:28 +0000 (-0500)
Subject: Merge branch 'power-resource' into release
X-Git-Tag: v2.6.38-rc1~68^2~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=07bf280521bb06bc8e64f0b998fc391253fcb959;p=~shefty%2Frdma-dev.git

Merge branch 'power-resource' into release
---

07bf280521bb06bc8e64f0b998fc391253fcb959