[tesla-dev] resolve conflict

[aubrey...@intel.com]

Author: Aubrey Li <aubrey.li at intel.com>
Repository: /hg/tesla/cpupm-gate
Latest revision: 2bd71453d981e32527d32cbb3019c3a681055005
Total changesets: 1
Log message:
resolve conflict

Files:
        update: usr/src/uts/i86pc/io/pwrnow.c