diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-29 19:29:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-29 19:29:54 +0200 |
| commit | 15b77435edad42c1b25adaafce2be50e8d29b2fc (patch) | |
| tree | 8e8a34828b50502eea491023e3d3d69f33786d4b /net/ipv4/xfrm4_mode_tunnel.c | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | x86, cpufeature: Remove stray %s, add -w to mkcapflags.pl (diff) | |
| download | linux-15b77435edad42c1b25adaafce2be50e8d29b2fc.tar.xz linux-15b77435edad42c1b25adaafce2be50e8d29b2fc.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpufeature: Remove stray %s, add -w to mkcapflags.pl
x86, cpufeature: Catch duplicate CPU feature strings
x86, cpufeature: Rename X86_FEATURE_DTS to X86_FEATURE_DTHERM
x86: Fix kernel-doc warnings
x86, compat: Use test_thread_flag(TIF_IA32) in compat signal delivery
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
0 files changed, 0 insertions, 0 deletions