tree a0305f7ac7810309d113eb1a542278b8bb9877e3
parent 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0
parent 16d752397301b95abaa95cbaf9e785d221872311
author Len Brown <len.brown@intel.com> 1214459795 -0400
committer Len Brown <len.brown@intel.com> 1214459795 -0400

Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release