lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
  includecheck fix: x86, cpu/common.c
  includecheck fix: kernel/trace, ring_buffer.c
  includecheck fix: include/linux, ftrace.h
  includecheck fix: include/linux, page_cgroup.h
  includecheck fix: include/linux, aio.h
  includecheck fix: include/drm, drm_memory.h
  includecheck fix: include/acpi, acpi_bus.h
  includecheck fix: drivers/xen, evtchn.c
  includecheck fix: drivers/video, vgacon.c
  includecheck fix: drivers/scsi, ibmvscsi.c
  includecheck fix: drivers/scsi, libfcoe.c
  includecheck fix: x86, shadow.c
  includecheck fix: x86, traps.c
  includecheck fix: um, helper.c
  includecheck fix: s390, sys_s390.c
This commit is contained in:
Linus Torvalds
2009-09-20 16:02:06 -07:00
parent dcbb5593d9 5ac7687860
commit ebc79c4f8d
15 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/cpu/common.c
View File

@ -34,7 +34,6 @@
#include <asm/mce.h>
#include <asm/msr.h>
#include <asm/pat.h>
#include <linux/smp.h>
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/uv/uv.h>

1
arch/x86/kernel/traps.c
View File

@ -65,7 +65,6 @@
#else
#include <asm/processor-flags.h>
#include <asm/setup.h>
#include <asm/traps.h>
asmlinkage int system_call(void);