| commit | 936e894a976dd3b0f07f1f6f43c17b77b7e6146d | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Sep 02 08:17:56 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Sep 02 08:17:56 2009 +0200 |
| tree | 5ed5c1f6735dcd26550594df23c8f7fe2aa21a15 | |
| parent | 69575d388603365f2afbf4166df93152df59b165 [diff] | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba [diff] |
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>