4d26043f6147d0451e313487482ed3391b8d
parent 5423a0cb3f74c16e90683f8ee1cec6c240a9556e
parent 56f382a08722186623400180adbb9d1be1721cee
parent ba193d64abfe644e8752affa310a368eda01f46e
parent 6defa2fe2019f3729933516fba5cfd75eecd07de
author Len Brown <len.brown@intel.com> 1235271703 -0500
committer Len Brown <len.brown@intel.com> 1235271703 -0500

Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend' into release