From: Len Brown <len.brown@intel.com>
Date: Tue, 13 Sep 2011 00:00:00 +0000 (-0400)
Subject: Merge branches 'apei', 'bz-13195' and 'doc' into acpi
X-Git-Tag: v3.1-rc7~67^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=38c0a0c9ae0d145d72c6865f4aec1107aef81310;p=linux.git

Merge branches 'apei', 'bz-13195' and 'doc' into acpi
---

38c0a0c9ae0d145d72c6865f4aec1107aef81310