diff options
| author | Ingo Molnar <[email protected]> | 2008-12-16 20:02:10 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-16 20:02:13 +0000 |
| commit | 7e91a122b11bb250d08ab125afd2c232c87502e1 (patch) | |
| tree | 9456e1affc0847a4950bd416d5cfbf720a5505af /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | x86: support always running TSC on Intel CPUs, add cpufeature definition (diff) | |
| download | kernel-7e91a122b11bb250d08ab125afd2c232c87502e1.tar.gz kernel-7e91a122b11bb250d08ab125afd2c232c87502e1.zip | |
Merge branch 'x86/cpufeature' into x86/tsc
Merge itto in x86/tsc because an upcoming patch relies on a new
cpuid bit defined in the x86/cpufeature branch.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions