From: Len Brown <len.brown@intel.com>
Date: Sun, 15 Aug 2010 03:55:47 +0000 (-0400)
Subject: Merge branch 'apei' into release
X-Git-Tag: v2.6.36-rc1~1^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=feb29c5175e61d0f1ec2cbcaccdfa55e588780be;p=users%2Fhch%2Fmisc.git

Merge branch 'apei' into release
---

feb29c5175e61d0f1ec2cbcaccdfa55e588780be