Commit 9b8ab9f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird 

* 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird:
  [PATCH] severing poll.h -> mm.h
  [PATCH] severing skbuff.h -> mm.h
  [PATCH] severing skbuff.h -> poll.h
  [PATCH] severing skbuff.h -> highmem.h
  [PATCH] severing uaccess.h -> sched.h
  [PATCH] severing fs.h, radix-tree.h -> sched.h
  [PATCH] severing module.h->sched.h
parents 12472b41 f23f6e08

arch/i386/kernel/acpi/cstate.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/cpu.h>

#include <linux/sched.h>



#include <acpi/processor.h>

#include <asm/acpi.h>

arch/i386/kernel/alternative.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/list.h>

#include <asm/alternative.h>

arch/i386/kernel/cpu/mcheck/therm_throt.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/cpu.h>

#include <asm/cpu.h>

#include <linux/notifier.h>

#include <linux/jiffies.h>

#include <asm/therm_throt.h>



/* How long to wait between reporting thermal events */

drivers/acpi/dock.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/notifier.h>

#include <linux/jiffies.h>

#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>

drivers/base/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/sysdev.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/sched.h>

#include <linux/cpu.h>

#include <linux/topology.h>

#include <linux/device.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE