diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 09:28:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 09:28:15 -0700 |
| commit | c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee (patch) | |
| tree | 3cd15a14d78b399c5dbeaf8beba7599615bc40bd /net/ipv4/ah4.c | |
| parent | 1b674bf106f59e04e24b3825c2f08dcd9a5b7264 (diff) | |
| parent | 140f190bc3a3b6f200548d204befd998eadd63fd (diff) | |
| parent | 35f1790e6c6a7e4cae57b616cf36444d27fa6b28 (diff) | |
| parent | 513c4ec6e4759aa33c90af0658b82eb4d2027871 (diff) | |
| parent | 42dfc43ee5999ac64284476ea0ac6c937587cf2b (diff) | |
| parent | b0deca2e0270135f797e81bdb0743e50fd1dc58d (diff) | |
| download | linux-3.10-c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee.tar.gz linux-3.10-c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee.tar.bz2 linux-3.10-c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee.zip | |
Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus', 'x86-cpufeature-for-linus', 'x86-process-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull trivial x86 branches from Ingo Molnar: small one-liners to fix up
details.
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Remove some noise from boot log when starting cpus
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, boot: Fix port argument to inl() function
* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpufeature: Add CPU features from Intel document 319433-012A
* 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86_64: Record stack pointer before task execution begins
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/UV: Lower UV rtc clocksource rating