Merge commit 'origin/master' into next
This commit is contained in:
@@ -9,10 +9,6 @@
|
||||
|
||||
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
|
||||
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
|
||||
struct mm_struct init_mm = INIT_MM(init_mm);
|
||||
|
||||
EXPORT_SYMBOL(init_mm);
|
||||
|
||||
/*
|
||||
* Initial thread structure.
|
||||
*
|
||||
|
@@ -44,10 +44,7 @@
|
||||
#include <asm/sections.h>
|
||||
#include <asm/machdep.h>
|
||||
|
||||
#ifdef CONFIG_LOGO_LINUX_CLUT224
|
||||
#include <linux/linux_logo.h>
|
||||
extern const struct linux_logo logo_linux_clut224;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Properties whose value is longer than this get excluded from our
|
||||
|
Reference in New Issue
Block a user