From fb3fcf59010d8d92bc19e1502e25987236056acf Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 26 May 2006 11:51:08 -0700
Subject: [PATCH] --- yaml --- r: 26973 b: refs/heads/master c:
 309c68cc17ba1f6f733038562b7469b5340e1a1d h: refs/heads/master i:   26971:
 aef9fde23e30c7afcb7ed0355da3af7fb56a9245 v: v3

---
 [refs]                                 | 2 +-
 trunk/Makefile                         | 4 ++--
 trunk/arch/s390/kernel/time.c          | 2 +-
 trunk/drivers/media/common/Kconfig     | 2 +-
 trunk/drivers/media/dvb/pluto2/Kconfig | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a12f11b81006..0e6cacf92987 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab28b171eabc0a414e0404844453c11af3caed10
+refs/heads/master: 309c68cc17ba1f6f733038562b7469b5340e1a1d
diff --git a/trunk/Makefile b/trunk/Makefile
index 3494c17c9fb9..435d209f42d8 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 17
-EXTRAVERSION =-rc4
-NAME=Sliding Snow Leopard
+EXTRAVERSION =-rc5
+NAME=Lordi Rules
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
index ce19ad4e92ec..2a6c6efb6865 100644
--- a/trunk/arch/s390/kernel/time.c
+++ b/trunk/arch/s390/kernel/time.c
@@ -272,7 +272,7 @@ static inline void stop_hz_timer(void)
 	next = next_timer_interrupt();
 	do {
 		seq = read_seqbegin_irqsave(&xtime_lock, flags);
-		timer = (__u64 next) - (__u64 jiffies) + jiffies_64;
+		timer = ((__u64) next) - ((__u64) jiffies) + jiffies_64;
 	} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 	todval = -1ULL;
 	/* Be careful about overflows. */
diff --git a/trunk/drivers/media/common/Kconfig b/trunk/drivers/media/common/Kconfig
index 9c45b983e0de..1a04db4552da 100644
--- a/trunk/drivers/media/common/Kconfig
+++ b/trunk/drivers/media/common/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_SAA7146
 	tristate
-	select I2C
+	depends on I2C
 
 config VIDEO_SAA7146_VV
 	tristate
diff --git a/trunk/drivers/media/dvb/pluto2/Kconfig b/trunk/drivers/media/dvb/pluto2/Kconfig
index 48252e9ce586..7d8e6e87bdbb 100644
--- a/trunk/drivers/media/dvb/pluto2/Kconfig
+++ b/trunk/drivers/media/dvb/pluto2/Kconfig
@@ -1,7 +1,6 @@
 config DVB_PLUTO2
 	tristate "Pluto2 cards"
 	depends on DVB_CORE && PCI && I2C
-	select I2C
 	select I2C_ALGOBIT
 	select DVB_TDA1004X
 	help