Merge branch 'linus' into core/rcu

This commit is contained in:
Ingo Molnar
2008-06-16 11:23:36 +02:00
1446 changed files with 19981 additions and 12351 deletions
+1
View File
@@ -13,6 +13,7 @@ config DEFCONFIG_LIST
default "/lib/modules/$UNAME_RELEASE/.config"
default "/etc/kernel-config"
default "/boot/config-$UNAME_RELEASE"
default "$ARCH_DEFCONFIG"
default "arch/$ARCH/defconfig"
menu "General setup"
-1
View File
@@ -24,7 +24,6 @@ static struct {
static int md_setup_ents __initdata;
extern int mdp_major;
/*
* Parse the command-line parameters given our kernel, but do not
* actually try to invoke the MD device now; that is handled by