Merge nuts.ninka.net:/disk1/davem/BK/network-2.6

into nuts.ninka.net:/disk1/davem/BK/net-2.6

Makefile

 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 2
-EXTRAVERSION =-rc1
+EXTRAVERSION =-rc2
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"

drivers/ide/ide-disk.c

@@ -1605,8 +1605,8 @@ static void idedisk_setup (ide_drive_t *drive)
 	if (drive->addressing == 0 && drive->capacity64 > 1ULL << 28) {
 		printk("%s: cannot use LBA48 - full capacity "
 		       "%llu sectors (%llu MB)\n",
-		       drive->name,
-		       drive->capacity64, sectors_to_MB(drive->capacity64));
+		       drive->name, (unsigned long long)drive->capacity64,
+		       sectors_to_MB(drive->capacity64));
 		drive->capacity64 = 1ULL << 28;
 	}