| commit | 59293c8ad54726150cf6178164311b004d615ce4 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Sep 30 12:16:26 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Sep 30 12:16:26 2008 +0200 |
| tree | 6fcf8e59a2c9ac08a4ff092544c34d2254ac0d74 | |
| parent | 45f197ade73ba95681b9803680c75352fc0a1c0a [diff] | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 [diff] |
Merge commit 'v2.6.27-rc8' into oprofile Conflicts: arch/x86/oprofile/nmi_int.c Signed-off-by: Ingo Molnar <mingo@elte.hu>