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, 5 insertions, 5 deletions

diff --git a/arch/powerpc/boot/mktree.c b/arch/powerpc/boot/mktree.c
index 45d06a8c7cd1..c2baae0a3d89 100644
--- a/arch/powerpc/boot/mktree.c
+++ b/arch/powerpc/boot/mktree.c
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 {
         int     in_fd, out_fd;
         int     nblks, i;
-        uint    cksum, *cp;
+        unsigned int    cksum, *cp;
         struct  stat    st;
         boot_block_t    bt;
 
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 
         cksum = 0;
         cp = (void *)&bt;
-        for (i=0; i<sizeof(bt)/sizeof(uint); i++)
+        for (i = 0; i < sizeof(bt) / sizeof(unsigned int); i++)
                 cksum += *cp++;
 
         /* Assume zImage is an ELF file, and skip the 64K header.
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
                 exit(4);
         }
 
-        if ((*(uint *)tmpbuf) != htonl(0x7f454c46)) {
+        if ((*(unsigned int *)tmpbuf) != htonl(0x7f454c46)) {
                 fprintf(stderr, "%s is not an ELF image\n", argv[1]);
                 exit(4);
         }
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
                         perror("zImage read");
                         exit(5);
                 }
-                cp = (uint *)tmpbuf;
-                for (i=0; i<sizeof(tmpbuf)/sizeof(uint); i++)
+                cp = (unsigned int *)tmpbuf;
+                for (i = 0; i < sizeof(tmpbuf) / sizeof(unsigned int); i++)
                         cksum += *cp++;
                 if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {
                         perror("boot-image write");