Skip to content
Commit 4a8f5058 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528',...


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: default avatarLen Brown <len.brown@intel.com>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment