Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/init/initramfs.c b/init/initramfs.c
index 9ee7b7810417..4c00edc59689 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -574,11 +574,10 @@ static int __init populate_rootfs(void)
         if (initrd_start) {
 #ifdef CONFIG_BLK_DEV_RAM
                 int fd;
-                printk(KERN_INFO "checking if image is initramfs...\n");
+                printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n");
                 err = unpack_to_rootfs((char *)initrd_start,
                         initrd_end - initrd_start);
                 if (!err) {
-                        printk(KERN_INFO "rootfs image is initramfs; unpacking...\n");
                         free_initrd();
                         return 0;
                 } else {
@@ -596,15 +595,11 @@ static int __init populate_rootfs(void)
                         free_initrd();
                 }
 #else
-                printk(KERN_INFO "Unpacking initramfs...");
+                printk(KERN_INFO "Unpacking initramfs...\n");
                 err = unpack_to_rootfs((char *)initrd_start,
                         initrd_end - initrd_start);
-                if (err) {
-                        printk(" failed!\n");
-                        printk(KERN_EMERG "%s\n", err);
-                } else {
-                        printk(" done\n");
-                }
+                if (err)
+                        printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
                 free_initrd();
 #endif
         }