Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] partitions: fix build error in ibm partition detection code
  [S390] appldata: fix dev_get_stats 64 bit conversion
  [S390] wire up prlimit64 and fanotify* syscalls
  [S390] zcrypt: fix Kconfig dependencies
  [S390] sys_personality: follow u_long to unsigned int conversion
  [S390] dasd: fix format string types

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1a84fae155e1..8373ca0de8e0 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1325,14 +1325,14 @@ static void __dasd_device_check_expire(struct dasd_device *device)
                 if (device->discipline->term_IO(cqr) != 0) {
                         /* Hmpf, try again in 5 sec */
                         dev_err(&device->cdev->dev,
-                                "cqr %p timed out (%is) but cannot be "
+                                "cqr %p timed out (%lus) but cannot be "
                                 "ended, retrying in 5 s\n",
                                 cqr, (cqr->expires/HZ));
                         cqr->expires += 5*HZ;
                         dasd_device_set_timer(device, 5*HZ);
                 } else {
                         dev_err(&device->cdev->dev,
-                                "cqr %p timed out (%is), %i retries "
+                                "cqr %p timed out (%lus), %i retries "
                                 "remaining\n", cqr, (cqr->expires/HZ),
                                 cqr->retries);
                 }