Skip to content
Snippets Groups Projects
Commit 936e894a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.31-rc8' into x86/txt 


Conflicts:
	arch/x86/kernel/reboot.c
	security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 69575d38 326ba501
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 568 additions and 420 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