aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-15 15:59:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-15 15:59:05 -0700
commit9420d00beb613b2fcb4d76c354b51db7d4405105 (patch)
tree9431b17a7481a70a73fb342be0675c12b6470250
parentc01278a68bb31f32de4d1a75959704e65697439f (diff)
downloadpatches-9420d00beb613b2fcb4d76c354b51db7d4405105.tar.gz
2.6.30-rc2
-rw-r--r--f.patch16
-rw-r--r--series1
-rw-r--r--version2
3 files changed, 18 insertions, 1 deletions
diff --git a/f.patch b/f.patch
new file mode 100644
index 00000000000000..3ba51fe9322b1e
--- /dev/null
+++ b/f.patch
@@ -0,0 +1,16 @@
+---
+ drivers/base/core.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/base/core.c
++++ b/drivers/base/core.c
+@@ -1142,6 +1142,9 @@ int device_for_each_child(struct device
+ struct device *child;
+ int error = 0;
+
++ if (!parent->p)
++ return 0;
++
+ klist_iter_init(&parent->p->klist_children, &i);
+ while ((child = next_device(&i)) && !error)
+ error = fn(child, data);
diff --git a/series b/series
index 6d2a6963259eae..c9defe6ba479d7 100644
--- a/series
+++ b/series
@@ -115,3 +115,4 @@ staging/staging-go7007-fix-build-issues.patch
#staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch
+f.patch
diff --git a/version b/version
index d129ee811df7d5..2888bcd98c1693 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.30-rc1-git5
+2.6.30-rc2