summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-05 12:36:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-05 12:36:12 -0700
commit050ba07cdc9aaef17e1be251aa8fceb9a919d5d3 (patch)
tree11d435a13b4ba670bec21610a19d566b348efeca /arch/um
parent27c053aa8d18d1fa7b83041e36bad20bcdf55514 (diff)
parent4488e09b4582c3d9cae1601351e26584e208d877 (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: "Fix for the annoying paravirt.o build warning under allmodconfig, and a MAINTAINERS file update" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, doc: Add an entry in MAINTAINERS for arch/x86/kernel/cpu/vmware.c x86, paravirt: Remove duplicate definition for DEF_NATIVE
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions