aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-05-16 09:43:14 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-16 09:43:14 -0700
commit0e1cf9d215813798729873ddb5db61d5dbae7730 (patch)
treef1e195328e9021333e6e628c5e0f1b4d9a5cf8f3
parent2394a0d404e4307972803aff778ca75927004b09 (diff)
downloadpatches-0e1cf9d215813798729873ddb5db61d5dbae7730.tar.gz
2.6.26-rc2-git5
-rw-r--r--driver-core/warn-when-statically-allocated-kobjects-are-used.patch2
-rw-r--r--version2
2 files changed, 2 insertions, 2 deletions
diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
index 66bd2dde247c0f..109467c1327fac 100644
--- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
+++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
void setup_arch(char **);
--- a/init/main.c
+++ b/init/main.c
-@@ -789,12 +789,21 @@ static void run_init_process(char *init_
+@@ -791,12 +791,21 @@ static void run_init_process(char *init_
kernel_execve(init_filename, argv_init, envp_init);
}
diff --git a/version b/version
index 7c1f31cd1963d8..0ed462948c3cc3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26-rc2-git4
+2.6.26-rc2-git5