Merge cantab.net:/home/src/bklinux-2.6

into cantab.net:/home/src/ntfs-2.6

2 files changed, 2 insertions, 2 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index abae250cf73d..d9b9694fd2e8 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -276,7 +276,7 @@ static void wake_futex(struct futex_q *q)
 	 * The waiting task can free the futex_q as soon as this is written,
 	 * without taking any locks.  This must come last.
 	 */
-	q->lock_ptr = 0;
+	q->lock_ptr = NULL;
 }
 
 /*
diff --git a/kernel/power/pm.c b/kernel/power/pm.c
index 09d55363cefc..d1bc943072d4 100644
--- a/kernel/power/pm.c
+++ b/kernel/power/pm.c
@@ -282,7 +282,7 @@ struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from)
 			return dev;
 		entry = entry->next;
 	}
-	return 0;
+	return NULL;
 }
 
 EXPORT_SYMBOL(pm_register);