Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Makefile

 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 9
-EXTRAVERSION =
-NAME=Zonked Quokka
+SUBLEVEL = 10
+EXTRAVERSION =-rc1
+NAME=Woozy Numbat
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"

arch/um/Kconfig_block

@@ -69,5 +69,6 @@ config MMAPPER
         If you'd like to be able to provide a simulated IO port space for
         User-Mode Linux processes, say Y.  If unsure, say N.
 
-endmenu
+source "drivers/block/Kconfig.iosched"
 
+endmenu