From: Len Brown <len.brown@intel.com>
Date: Tue, 2 Aug 2011 21:22:09 +0000 (-0400)
Subject: Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm... 
X-Git-Tag: v3.1-rc1~80^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4a8f5058bde15d737abe39b5bed3f21dcb6599d2;p=linux.git

Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm', 'kexec-param' and 'misc' into release

Conflicts:
	Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>
---

4a8f5058bde15d737abe39b5bed3f21dcb6599d2