tree 5afba4e8daae642d33b7a4daa97d63c54776b786
parent 26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7
parent dd8cd7793781c87be47bbfee65efa3fb5110f898
author Len Brown <len.brown@intel.com> 1202372383 -0500
committer Len Brown <len.brown@intel.com> 1202372383 -0500

Merge branches 'release' and 'wmi-2.6.25' into release