Skip to content
Snippets Groups Projects
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>
parents 3eb208f0 eb03cb02 d7f6169a e4108292 bb0c5ed6 aa165971 4996c023 6c8111e9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 99 additions and 75 deletions
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