Merge commit 'v2.6.31-rc8' into x86/txt (936e894a) · Commits · 方亚芬 / linux

Commit 936e894a authored Sep 02, 2009 by

Ingo Molnar

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: Ingo Molnar <mingo@elte.hu>

parents 69575d38 326ba501

Expand all Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment