summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-06-24 11:01:09 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2013-06-24 11:01:09 -0700
commit5236eb968ec21c693d463d0494e39b00c1bc174d (patch)
tree1bb6abc27df94dad156225b7d2ec31d04fd9cdd7 /arch/x86/kernel/Makefile
parent33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2 (diff)
parent2b4bc78956bdcc2bb4c49b3af955be776817e897 (diff)
Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace
Fix from Steven Rostedt.
Diffstat (limited to 'arch/x86/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions