Merge branch 'x86/ptrace' into x86/tsc

Browse source

Conflicts:
	arch/x86/kernel/cpu/intel.c

...

This commit is contained in:

Ingo Molnar 2008-12-23 16:29:31 +01:00

parent 345077cd98 f4166c54bf

commit 7e3cbc3f77

3 changed files with 9 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/kernel/cpu/intel.c

View file

9

arch/x86/kernel/ds.c

View file

9

arch/x86/kernel/ptrace.c

View file