summaryrefslogtreecommitdiffstats
path: root/drivers/misc/ioc4.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-29 19:29:54 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-29 19:29:54 +0200
commit15b77435edad42c1b25adaafce2be50e8d29b2fc (patch)
tree8e8a34828b50502eea491023e3d3d69f33786d4b /drivers/misc/ioc4.c
parentMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentx86, cpufeature: Remove stray %s, add -w to mkcapflags.pl (diff)
downloadlinux-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 'drivers/misc/ioc4.c')
0 files changed, 0 insertions, 0 deletions