Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

Makefile

 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 37
+SUBLEVEL = 38
 EXTRAVERSION =
 
 # *DOCUMENTATION*

drivers/block/genhd.c

@@ -174,6 +174,10 @@ static int show_partition(struct seq_file *part, void *v)
 	if (sgp == gendisk_head)
 		seq_puts(part, "major minor  #blocks  name\n\n");
 
+	/* Don't show non-partitionable devices or empty devices */
+	if (!sgp->minor_shift || !get_capacity(sgp))
+		return 0;
+
 	/* show the full disk and all non-0 size partitions of it */
 	seq_printf(part, "%4d  %4d %10ld %s\n",
 		sgp->major, sgp->first_minor,

mm/numa.c

@@ -27,6 +27,7 @@ void __init free_area_init_node(int nid, pg_data_t *pgdat, struct page *pmap,
 {
 	unsigned long size;
 
+	pgdat = &contig_page_data;
 	contig_page_data.node_id = 0;
 	contig_page_data.node_start_pfn = node_start_pfn;
 	calculate_totalpages (&contig_page_data, zones_size, zholes_size);