Merge remote-tracking branch 'powerpc/next'

Conflicts:
	drivers/scsi/ipr.c

diff --cc arch/powerpc/configs/ppc64_defconfig
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc arch/powerpc/mm/fault.c
Simple merge

diff --cc drivers/scsi/ipr.c
index 45e192a510056cd65761d8e2281dfdf6dd13ac7c,6077c43edacc00d9b7d05faf1cbce7c4ef4296d8..33aab5f5cffa136ebd8eeaa018cffccf6f1aa38f
--- 1/drivers/scsi/ipr.c
--- 2/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@@ -6330,8 -6330,8 +6330,8 @@@ static int ipr_invalid_adapter(struct i
        int i;
  
        if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
 -              for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
 +              for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
-                       if (__is_processor(ipr_blocked_processors[i]))
+                       if (pvr_version_is(ipr_blocked_processors[i]))
                                return 1;
                }
        }

diff --cc drivers/tty/hvc/hvc_console.c
Simple merge