summaryrefslogtreecommitdiff
path: root/inotify.h
diff options
context:
space:
mode:
Diffstat (limited to 'inotify.h')
0 files changed, 0 insertions, 0 deletions
1ebbab00 (patch) tree1f0a24b433f0a4d096d1b87e56e682a873c8dab1 parentac2440654df6ac7314e2f8819fe05e7c863a2392 (diff)parent8d415ee225a3d15d3e3029524350e8237a4de7b8 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Two topology corner case fixes, and a MAINTAINERS file update for mmiotrace maintenance" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/topology: Set x86_max_cores to 1 for CONFIG_SMP=n MAINTAINERS: Add mmiotrace entry x86/topology: Handle CPUID bogosity gracefully
Diffstat