| commit | 04197c83b3e05546d1003cfa3ff43f1639c0057f | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Aug 15 17:07:34 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Aug 15 17:07:34 2008 +0200 |
| tree | c04ddce9f519b91c0b20c6c09f7529928350eefe | |
| parent | 71998e83c520c7a91b254dc9705baeedbee0d44f [diff] | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 [diff] |
Merge branch 'linus' into x86/tracehook Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar <mingo@elte.hu>